Fix haproxy/novnc interaction in containers setup

nova-novncproxy pod is currently listening at platform floating mgmt
address port 6080 in containers setup.  However this implicitly requires
the pod to track the active controller which is not desired or
enforceable causing the pod to frequently fail to come up.

To fix, don't override config option vnc/novncproxy_host.  This will
revert behaviour to upstream default of listening at 0.0.0.0:6080 but
also requires that we do not configure nova forwarding in haproxy to
avoid port conflict.  This is in line with overall networking
architecture for containers.

Story: 2003909
Task: 27081
Change-Id: I8eff1ad837c6a874a2a11e2f6bc73876042bb171
Signed-off-by: Gerry Kopec <gerry.kopec@windriver.com>
This commit is contained in:
Gerry Kopec 2018-11-26 17:32:01 -05:00 committed by Gerry Kopec
parent 27cdaf8620
commit 8d4b249723
2 changed files with 4 additions and 2 deletions

View File

@ -575,6 +575,7 @@ class openstack::nova::api::services
class openstack::nova::api
inherits ::openstack::nova::params {
include ::platform::kubernetes::params
include ::platform::params
if ($::openstack::nova::params::service_create and
@ -587,7 +588,9 @@ class openstack::nova::api
if $::openstack::nova::params::configure_endpoint {
include ::openstack::nova::firewall
include ::openstack::nova::haproxy
if $::platform::kubernetes::params::enabled != true {
include ::openstack::nova::haproxy
}
}
}

View File

@ -153,7 +153,6 @@ class NovaHelm(openstack.OpenstackBaseHelm):
'weight_setting': 'vswitch.max_avail=100.0'
},
'vnc': {
'novncproxy_host': self._get_management_address(),
'novncproxy_base_url': self._get_novncproxy_base_url(),
},
'upgrade_levels': 'None'