diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-24 19:35:01 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-24 19:41:18 +0100 |
| commit | 0c71112ec06bd73a3ddc42ba0aacd666e9a00553 (patch) | |
| tree | 45a731630cfc5abf0402eee6bf929d73f128dc64 /mcp/config | |
| parent | 8701fa18679b5deefe0b8faf0eb7dde30b1c7703 (diff) | |
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 <Alexandru.Avadanii@enea.com>
Change-Id: Iea8f0bd90ee8d12f399aad16247dda274d6a907a
Diffstat (limited to 'mcp/config')
| -rwxr-xr-x | mcp/config/states/openstack_ha | 1 |
1 files changed, 0 insertions, 1 deletions
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 \ |