From 0c71112ec06bd73a3ddc42ba0aacd666e9a00553 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 24 Nov 2017 19:35:01 +0100 Subject: Revert "Apply apache state on proxy nodes" Upstream fixed the salt-formula-horizon in commit 95387ec, by defining 8078 (and only that) port in Apache's ports.conf. This fixes the port 80 overlap, so running the `apache` high state after the `horizon` high state not only is unnecessary now, but also would lead to new breakage, since `apache` state would overwrite the ports.conf (removing 8078 and adding 80), i.e. creating a new port conflict and breaking Horizon port completely. This reverts commit eb4645206d6d74992fca3b8726ee2eebca97205f. Conflicts: mcp/config/states/openstack_ha mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml Signed-off-by: Alexandru Avadanii Change-Id: Iea8f0bd90ee8d12f399aad16247dda274d6a907a --- mcp/config/states/openstack_ha | 1 - .../cluster/baremetal-mcp-ocata-common/openstack_proxy.yml | 8 -------- 2 files changed, 9 deletions(-) (limited to 'mcp') diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha index e1fdf7382..0c1b82f48 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -63,7 +63,6 @@ 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,sphinx 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 6239df2ef..84845658c 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,7 +16,6 @@ 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 @@ -76,10 +75,3 @@ 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