aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-24 19:35:01 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-24 19:41:18 +0100
commit0c71112ec06bd73a3ddc42ba0aacd666e9a00553 (patch)
tree45a731630cfc5abf0402eee6bf929d73f128dc64 /ci
parent8701fa18679b5deefe0b8faf0eb7dde30b1c7703 (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 'ci')
0 files changed, 0 insertions, 0 deletions