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>

diff --git a/ansible/roles/configure_uwsgi/tasks/main.yml b/ansible/roles/configure_uwsgi/tasks/main.yml
index 6a22446..8822bda 100644 (file)
--- 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 495febb..1890f16 100644 (file)
--- 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> #}