commit d75275394c3039ac2e08940839dfa9de19595e60
author Marek Celoud <mceloud@mirantis.com> Fri Nov 10 10:18:32 2017 +0000
committer Gerrit Code Review <gerrit2@44cc31867e31> Fri Nov 10 10:18:32 2017 +0000
tree 4651dc1fb6168025320f8c94817bfee9aa49ed42
parent 92d6628a353db4a4062c49bef60ae6d7fa5a46a8
parent 73367c09e27cec09fcb215f88cb7d8b13d1e05fb

Merge "Adjusting cinder salt-formula for pike"

cinder/controller.sls

diff --git a/cinder/controller.sls b/cinder/controller.sls
index 9f9f088..bfb36b0 100644
--- a/cinder/controller.sls
+++ b/cinder/controller.sls
@@ -46,7 +46,7 @@
 
 {%- endfor %}
 
-{%- if controller.version == 'ocata' %}
+{%- if controller.version in ('ocata','pike') %}
 
 /etc/apache2/conf-available/cinder-wsgi.conf:
   file.managed:

cinder/files/ocata/cinder-wsgi.conf

diff --git a/cinder/files/ocata/cinder-wsgi.conf b/cinder/files/ocata/cinder-wsgi.conf
index 153adde..b228a06 100644
--- a/cinder/files/ocata/cinder-wsgi.conf
+++ b/cinder/files/ocata/cinder-wsgi.conf
@@ -2,7 +2,7 @@
 Listen {{ controller.osapi.host }}:8776
 
 <VirtualHost {{ controller.osapi.host }}:8776>
-    WSGIDaemonProcess cinder-wsgi processes=5 threads=1 user=cinder display-name=%{GROUP}
+    WSGIDaemonProcess cinder-wsgi processes=5 threads=1 user=cinder group=cinder display-name=%{GROUP}
     WSGIProcessGroup cinder-wsgi
     WSGIScriptAlias / /usr/bin/cinder-wsgi
     WSGIApplicationGroup %{GLOBAL}