commit 29656ced6a48f559b34976ebfcd6298d4283d2b9
author Vasyl Saienko <vsaienko@mirantis.com> Sat Mar 03 05:27:59 2018 +0200
committer Vasyl Saienko <vsaienko@mirantis.com> Sun Mar 11 17:24:42 2018 +0000
tree 92fe56b1ab7b7abc389bfb95f1b4acb873814b8f
parent ad91ddb98436f26b0c2c9b43c7802f28e1dca5ab

Deprecate using intree nova placement wsgi template

All openstack services uses 99% persent same wsgi apache config.
This patch adds functionality to configure nova-placement wsgi conf
from apache pillar. To do this on cluster level the following file
should be included:
 - system.apache.server.site.nova-placement

The intree wsgi template will be removed when we switch all model
and cookiecutter to use apache template.

Change-Id: Id6ec48ffa93db572d6a2a8257946a4a1d2fbedb3

tests/pillar/control_cluster.sls

diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index c708f81..f11a947 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -2,7 +2,7 @@
   controller:
     enabled: true
     networking: default
-    version: liberty
+    version: pike
     vncproxy_url: 127.0.0.1
     vnc_keymap: en-gb
     security_group: false
@@ -75,3 +75,40 @@
       compute: liberty
     barbican:
       enabled: true
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20
+    site:
+      nova_placement:
+        enabled: false
+        available: true
+        type: wsgi
+        name: nova_placement
+        wsgi:
+          daemon_process: nova-placement
+          processes: 5
+          threads: 1
+          user: nova
+          group: nova
+          display_name: '%{GROUP}'
+          script_alias: '/ /usr/bin/nova-placement-api'
+          application_group: '%{GLOBAL}'
+          authorization: 'On'
+        limits:
+          request_body: 114688
+        host:
+          address: 127.0.0.1
+          name: 127.0.0.1
+          port: 8778

tests/pillar/control_single.sls

diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index da4cd10..3b36463 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -2,7 +2,7 @@
   controller:
     enabled: true
     networking: contrail
-    version: liberty
+    version: pike
     security_group: false
     vncproxy_url: 127.0.0.1
     vnc_keymap: en-gb
@@ -69,3 +69,18 @@
       'context_is_admin': 'role:admin or role:administrator'
       'compute:create': 'rule:admin_or_owner'
       'compute:create:attach_network':
+apache:
+  server:
+    enabled: true
+    default_mpm: event
+    mpm:
+      prefork:
+        enabled: true
+        servers:
+          start: 5
+          spare:
+            min: 2
+            max: 10
+        max_requests: 0
+        max_clients: 20
+        limit: 20