Revert "Apply apache state on proxy nodes" 31/47831/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Fri, 24 Nov 2017 18:35:01 +0000 (19:35 +0100)
committerMichael Polenchuk <mpolenchuk@mirantis.com>
Mon, 27 Nov 2017 07:47:43 +0000 (07:47 +0000)
commitb4cb2de10a932439d6089294f7bf29f01f6602da
treec645b7accc1e2ed1bbed8e33e4d86a4a194763d8
parenta56f66307f265b5e5f3f32cee9fe19a3c717b1d7
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
(cherry picked from commit 0c71112ec06bd73a3ddc42ba0aacd666e9a00553)
mcp/config/states/openstack_ha
mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_proxy.yml