Deprecate informula wsgi script
All openstack services uses 99% persent same wsgi apache config.
This patch adds functionality to configure barbican apache wsgi config
from the pillar. To do this on cluster level the following file
should be included:
- system.apache.server.site.barbican
The intree wsgi template will be removed when we switch all model
and cookiecutter to use apache template.
Change-Id: Ic0170c14027446c2bf15578f65744bd5ddc07adc
diff --git a/tests/pillar/control_cluster.sls b/tests/pillar/control_cluster.sls
index b5fc183..938a5bd 100644
--- a/tests/pillar/control_cluster.sls
+++ b/tests/pillar/control_cluster.sls
@@ -88,4 +88,15 @@
apache:
server:
enabled: true
- default_mpm: event
\ No newline at end of file
+ default_mpm: event
+ mpm:
+ prefork:
+ enabled: true
+ servers:
+ start: 5
+ spare:
+ min: 2
+ max: 10
+ max_requests: 0
+ max_clients: 20
+ limit: 20
diff --git a/tests/pillar/control_single.sls b/tests/pillar/control_single.sls
index 0a94c8e..330f409 100644
--- a/tests/pillar/control_single.sls
+++ b/tests/pillar/control_single.sls
@@ -85,3 +85,57 @@
port: 11211
- host: 10.10.10.12
port: 11211
+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:
+ barbican:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican
+ wsgi:
+ daemon_process: barbican-api
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/barbican-wsgi-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'
+ host:
+ address: 127.0.0.1
+ name: 127.0.0.1
+ port: 9311
+ barbican_admin:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican_admin
+ wsgi:
+ daemon_process: barbican-api-admin
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/barbican-wsgi-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'
+ host:
+ address: 127.0.0.1
+ name: 127.0.0.1
+ port: 9312
diff --git a/tests/pillar/ssl.sls b/tests/pillar/ssl.sls
index 4a067f5..f3799df 100644
--- a/tests/pillar/ssl.sls
+++ b/tests/pillar/ssl.sls
@@ -127,3 +127,57 @@
port: 11211
- host: 10.10.10.12
port: 11211
+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:
+ barbican:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican
+ wsgi:
+ daemon_process: barbican-api
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/barbican-wsgi-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'
+ host:
+ address: 127.0.0.1
+ name: 127.0.0.1
+ port: 9311
+ barbican_admin:
+ enabled: false
+ available: true
+ type: wsgi
+ name: barbican_admin
+ wsgi:
+ daemon_process: barbican-api-admin
+ processes: 3
+ threads: 10
+ user: barbican
+ group: barbican
+ display_name: '%{GROUP}'
+ script_alias: '/ /usr/bin/barbican-wsgi-api'
+ application_group: '%{GLOBAL}'
+ authorization: 'On'
+ host:
+ address: 127.0.0.1
+ name: 127.0.0.1
+ port: 9312