diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-24 19:35:01 +0100 |
|---|---|---|
| committer |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-27 07:47:43 +0000 |
| commit | b4cb2de10a932439d6089294f7bf29f01f6602da (patch) | |
| tree | c645b7accc1e2ed1bbed8e33e4d86a4a194763d8 /mcp/config/labs | |
| parent | a56f66307f265b5e5f3f32cee9fe19a3c717b1d7 (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
(cherry picked from commit 0c71112ec06bd73a3ddc42ba0aacd666e9a00553)
Diffstat (limited to 'mcp/config/labs')
0 files changed, 0 insertions, 0 deletions