diff options
| author | Milo Casagrande <milo@ubuntu.com> | 2014-06-13 12:18:25 +0200 |
|---|---|---|
| committer | Milo Casagrande <milo@ubuntu.com> | 2014-06-13 12:18:25 +0200 |
| commit | 5dc7ac886f05740a3291357bd6398feb4501a451 (patch) | |
| tree | e74772a01d42e33a9880038ef990f4807b2173f0 /ansible | |
| parent | f5fe84dc471b74e0a6c6c03e59bad004e941057c (diff) | |
Fix ansible plyabook.
* Add missing nickname variable definition.
* Fix problem with django_manage commands that need env variables
defined.
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/host_vars/releases.linaro.org | 1 | ||||
| -rw-r--r-- | ansible/host_vars/snapshots.linaro.org | 1 | ||||
| -rw-r--r-- | ansible/host_vars/staging.releases.linaro.org | 1 | ||||
| -rw-r--r-- | ansible/host_vars/staging.snapshots.linaro.org | 1 | ||||
| -rw-r--r-- | ansible/roles/install-llp/tasks/main.yml | 10 |
5 files changed, 13 insertions, 1 deletions
diff --git a/ansible/host_vars/releases.linaro.org b/ansible/host_vars/releases.linaro.org index a4cda77..986e9ad 100644 --- a/ansible/host_vars/releases.linaro.org +++ b/ansible/host_vars/releases.linaro.org @@ -1,2 +1,3 @@ hostname: releases.linaro.org +nickname: releases.linaro.org django_settings: settings_releases diff --git a/ansible/host_vars/snapshots.linaro.org b/ansible/host_vars/snapshots.linaro.org index 5b500f6..af2e125 100644 --- a/ansible/host_vars/snapshots.linaro.org +++ b/ansible/host_vars/snapshots.linaro.org @@ -1,2 +1,3 @@ hostname: snapshots.linaro.org +nickname: snapshots.linaro.org django_settings: settings_snapshots diff --git a/ansible/host_vars/staging.releases.linaro.org b/ansible/host_vars/staging.releases.linaro.org index 6a50bf7..aed1925 100644 --- a/ansible/host_vars/staging.releases.linaro.org +++ b/ansible/host_vars/staging.releases.linaro.org @@ -1,2 +1,3 @@ hostname: staging.releases.linaro.org +nickname: staging-releases django_settings: settings_staging_releases diff --git a/ansible/host_vars/staging.snapshots.linaro.org b/ansible/host_vars/staging.snapshots.linaro.org index a8aec3a..2a7b867 100644 --- a/ansible/host_vars/staging.snapshots.linaro.org +++ b/ansible/host_vars/staging.snapshots.linaro.org @@ -1,2 +1,3 @@ hostname: staging.snapshots.linaro.org +nickname: staging-snapshots django_settings: settings_staging_snapshots diff --git a/ansible/roles/install-llp/tasks/main.yml b/ansible/roles/install-llp/tasks/main.yml index 827f46d..44f8532 100644 --- a/ansible/roles/install-llp/tasks/main.yml +++ b/ansible/roles/install-llp/tasks/main.yml @@ -41,20 +41,28 @@ - name: Run syncdb command django_manage: app_path={{ install_base }}/{{ hostname }}/{{ app_name }} pythonpath="{{ install_base }}/{{ hostname }}:{{ install_base }}/{{ hostname }}/{{ app_name }}:/{{ install_base }}/{{ hostname }}/configs/django" - settings={{ django_settings }} + settings="{{ django_settings }}" command=syncdb + environment: + PYTHONPATH: "{{ install_base }}/{{ hostname }}:{{ install_base }}/{{ hostname }}/{{ app_name }}:/{{ install_base }}/{{ hostname }}/configs/django" + DJANGO_SETTINGS_MODULE: "{{ django_settings }}" tags: - install - update + - django - name: Run collectstatic command django_manage: app_path={{ install_base }}/{{ hostname }}/{{ app_name }} pythonpath="{{ install_base }}/{{ hostname }}:{{ install_base }}/{{ hostname }}/{{ app_name }}:/{{ install_base }}/{{ hostname }}/configs/django" settings={{ django_settings }} command=collectstatic + environment: + PYTHONPATH: "{{ install_base }}/{{ hostname }}:{{ install_base }}/{{ hostname }}/{{ app_name }}:/{{ install_base }}/{{ hostname }}/configs/django" + DJANGO_SETTINGS_MODULE: "{{ django_settings }}" tags: - install - update + - django - name: Fix directory permissions file: path={{ install_base }}/{{ hostname }}/{{ app_name }} |