Apply apache state on proxy nodes

Apache module will take care of ports.conf file to prevent
bind socket conflict between apache & nginx services.

Change-Id: Ia76ec356002e1db0dabd20d8f355a1b16fc07b30
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
index e816a9d..c3a51a8 100755 (executable)
--- a/mcp/config/states/openstack_ha
+++ b/mcp/config/states/openstack_ha
@@ -63,6 +63,7 @@ salt -I 'ceilometer:server' state.sls ceilometer
 salt -I 'ceilometer:agent' state.sls ceilometer
 
 salt -I 'horizon:server' state.sls horizon
+salt -I 'apache:server' state.sls apache
 salt -I 'nginx:server' state.sls nginx
 
 clstr_vip_addr=$(salt -C 'I@nginx:server and *01*' --out=yaml \

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
index da31908..d93d9ee 100644 (file)
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml
@@ -16,6 +16,7 @@ classes:
   - system.nginx.server.proxy.openstack.aodh
   - system.nginx.server.proxy.openstack.ceilometer
   - system.horizon.server.single
+  - system.apache.server.single
   - system.salt.minion.cert.proxy
   - system.sphinx.server.doc.reclass
   - service.keepalived.cluster.single
@@ -46,3 +47,10 @@ parameters:
         proxy:
           alternative_names: "IP:${_param:openstack_proxy_address}"
           key_usage: 'digitalSignature, keyEncipherment'
+  apache:
+    server:
+      modules: ~
+  horizon:
+    server:
+      bind:
+        address: localhost