diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-11-27 07:47:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-27 07:47:17 +0000 |
| commit | dfa171cafe8cff7d91d49a6f450942b20cf82d8e (patch) | |
| tree | 05f1c7641c052bd91e0f288ad27230638a27263c /docs/submodules/octopus | |
| parent | 365678eda7ed777692476e399e53126d0b23dd00 (diff) | |
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
Diffstat (limited to 'docs/submodules/octopus')
0 files changed, 0 insertions, 0 deletions