diff options
| author |   Stepan Andrushko <stepanx.andrushko@intel.com> | 2018-08-22 19:01:28 +0300 |
|---|---|---|
| committer | Stepan Andrushko <stepanx.andrushko@intel.com> | 2018-09-11 12:30:17 +0000 |
| commit | 4a12ac423399b91d272f2c97ab65bbcff1581758 (patch) | |
| tree | ef27151baca62a8c122e6442afe93114533db645 /ansible | |
| parent | e87df6a6bd84778ed108bf917676cb06797d6157 (diff) | |
Update configure_uwsgi run in baremetal/container
Now "daemonize" prevents from installing Yardstick on baremetal.
Configuring:
"daemonize" in case "container" installation mode;
"logto" in case "baremetal" installation mode;
JIRA: YARDSTICK-1395
Change-Id: Ie390464db9c0816583edc711ed6526629d091bd3
Signed-off-by: Stepan Andrushko <stepanx.andrushko@intel.com>
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/configure_uwsgi/tasks/main.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/configure_uwsgi/templates/yardstick.ini.j2 | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ansible/roles/configure_uwsgi/tasks/main.yml b/ansible/roles/configure_uwsgi/tasks/main.yml index 6a2244657..8822bda53 100644 --- a/ansible/roles/configure_uwsgi/tasks/main.yml +++ b/ansible/roles/configure_uwsgi/tasks/main.yml @@ -39,6 +39,14 @@ owner: root mode: 0644 +- set_fact: + uwsgi_log: "logto" + when: installation_mode == inst_mode_container + +- set_fact: + uwsgi_log: "daemonize" + when: installation_mode != inst_mode_container + - name: Create the UWSGI config file template: src: yardstick.ini.j2 diff --git a/ansible/roles/configure_uwsgi/templates/yardstick.ini.j2 b/ansible/roles/configure_uwsgi/templates/yardstick.ini.j2 index 495febb19..1890f16f9 100644 --- a/ansible/roles/configure_uwsgi/templates/yardstick.ini.j2 +++ b/ansible/roles/configure_uwsgi/templates/yardstick.ini.j2 @@ -12,7 +12,7 @@ chmod-socket = 666 callable = app_wrapper enable-threads = true close-on-exec = 1 -logto = {{ log_dir }}/uwsgi.log +{{ uwsgi_log }} = {{ log_dir }}/uwsgi.log socket = {{ socket_file }} {# If virtual environment, we need to add: virtualenv = <virtual_env> #} |