Deprecate using informula wsgi config.
All openstack services uses 99% persent same wsgi apache config.
This patch adds functionality to configure cinder-wsgi.conf from
apache pillar. To do this on cluster level the following file
should be included:
- system.apache.server.site.cinder
The intree wsgi template will be removed when we switch all model
and cookiecutter to use apache template.
Change-Id: I6a3058d0fda074d2ddce9ea20d33a93cd3e18de7
diff --git a/.kitchen.yml b/.kitchen.yml
index 222da18..a00d4ec 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -18,6 +18,9 @@
- name: linux
repo: git
source: https://github.com/salt-formulas/salt-formula-linux
+ - name: apache
+ repo: git
+ source: https://github.com/salt-formulas/salt-formula-apache
- name: keystone
repo: git
source: https://github.com/salt-formulas/salt-formula-keystone
@@ -25,6 +28,7 @@
base:
"*":
- linux.system
+ - apache
- cinder
pillars:
top.sls:
@@ -79,6 +83,11 @@
volume:
enabled: false
+ - name: control_cluster
+ provisioner:
+ pillars-from-files:
+ cinder.sls: tests/pillar/control_cluster_intree_wsgi.sls
+
- name: gpfs_single
provisioner:
pillars-from-files: