diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-11-24 19:35:01 +0100 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-27 15:40:53 +0000 |
| commit | 81d92136d62377fcab52e3a20b1d270706aaf316 (patch) | |
| tree | 24a49c8c29afa8bcdbe308014278e61ff7859c76 /docs/submodules | |
| parent | 330fe120cece777331ab7e557f223b23f4b649ca (diff) | |
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 <Alexandru.Avadanii@enea.com>
Change-Id: Iea8f0bd90ee8d12f399aad16247dda274d6a907a
(cherry picked from commit 0c71112ec06bd73a3ddc42ba0aacd666e9a00553)
Diffstat (limited to 'docs/submodules')
| m--------- | docs/submodules/fuel | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/docs/submodules/fuel b/docs/submodules/fuel -Subproject a56f66307f265b5e5f3f32cee9fe19a3c717b1d +Subproject b4cb2de10a932439d6089294f7bf29f01f6602d |