From 81d92136d62377fcab52e3a20b1d270706aaf316 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Fri, 24 Nov 2017 19:35:01 +0100 Subject: Update git submodules * Update docs/submodules/fuel from branch 'stable/euphrates' - 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 (cherry picked from commit 0c71112ec06bd73a3ddc42ba0aacd666e9a00553) --- docs/submodules/fuel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/submodules') diff --git a/docs/submodules/fuel b/docs/submodules/fuel index a56f66307..b4cb2de10 160000 --- a/docs/submodules/fuel +++ b/docs/submodules/fuel @@ -1 +1 @@ -Subproject commit a56f66307f265b5e5f3f32cee9fe19a3c717b1d7 +Subproject commit b4cb2de10a932439d6089294f7bf29f01f6602da -- cgit 1.2.3-korg