Merge "Fix uwsgi configuration when using venv"

playbooks/roles/bifrost-keystone-install/tasks/bootstrap.yml

@@ -16,6 +16,7 @@
 - name: "If VENV is set in the environment, enable installation into venv"
   set_fact:
     enable_venv: true
+    uwsgi_venv: "{{ bifrost_venv_env.get('VIRTUAL_ENV', '') }}"
   when: lookup('env', 'VENV') | length > 0
 
 - name: "Get uwsgi install location"

playbooks/roles/bifrost-keystone-install/templates/keystone-admin.ini.j2

@@ -6,6 +6,9 @@ threads = 2
 plugin = python
 no-orphans = true
 chmod-socket = 660
+{% if uwsgi_venv is defined and uwsgi_venv | length > 0 %}
+virtualenv = {{ uwsgi_venv }}
+{% endif %}
 
 socket = /run/uwsgi/keystone-admin.socket
 pidfile = /run/uwsgi/keystone-admin.pid

playbooks/roles/bifrost-keystone-install/templates/keystone-public.ini.j2

@@ -6,6 +6,9 @@ threads = 2
 plugin = python
 no-orphans = true
 chmod-socket = 660
+{% if uwsgi_venv is defined and uwsgi_venv | length > 0 %}
+virtualenv = {{ uwsgi_venv }}
+{% endif %}
 
 socket = /run/uwsgi/keystone-public.socket
 pidfile = /run/uwsgi/keystone-public.pid