From dfa171cafe8cff7d91d49a6f450942b20cf82d8e Mon Sep 17 00:00:00 2001
From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Mon, 27 Nov 2017 07:47:17 +0000
Subject: Update git submodules

* Update docs/submodules/fuel from branch 'master'
  - Merge "Revert "Apply apache state on proxy nodes""
  - 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
---
 docs/submodules/fuel | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs')

diff --git a/docs/submodules/fuel b/docs/submodules/fuel
index 8a8674492..c0541b17b 160000
--- a/docs/submodules/fuel
+++ b/docs/submodules/fuel
@@ -1 +1 @@
-Subproject commit 8a867449217151f59766a74c6165ffc26c7f50b4
+Subproject commit c0541b17b817fbb2a017abea7cde4efad80b116f
-- 
cgit 1.2.3-korg