From eb4645206d6d74992fca3b8726ee2eebca97205f Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Fri, 10 Nov 2017 16:58:06 +0400 Subject: 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 --- mcp/config/states/openstack_ha | 1 + .../cluster/baremetal-mcp-ocata-common/openstack_proxy.yml | 8 ++++++++ 2 files changed, 9 insertions(+) (limited to 'mcp') diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index e816a9dcc..c3a51a85a 100755 --- 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 da3190815..d93d9ee5b 100644 --- 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 -- cgit 1.2.3-korg