diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-10 16:58:06 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-10 16:19:20 +0000 |
| commit | 9ef364212224ca4790f175d20c2176682c5a9c32 (patch) | |
| tree | ce711a528afbd6a7d4526a2f6ed60a27e4120373 | |
| parent | 0f9d744587a3ebf37b9f84a7ef73d9433961d317 (diff) | |
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>
(cherry picked from commit eb4645206d6d74992fca3b8726ee2eebca97205f)
| -rwxr-xr-x | mcp/config/states/openstack_ha | 1 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml | 8 |
2 files changed, 9 insertions, 0 deletions
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 |