From 8d4b249723d69cfda1c0ce1d8f69d2bef1d9482e Mon Sep 17 00:00:00 2001 From: Gerry Kopec Date: Mon, 26 Nov 2018 17:32:01 -0500 Subject: [PATCH] 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 --- puppet-manifests/src/modules/openstack/manifests/nova.pp | 5 ++++- sysinv/sysinv/sysinv/sysinv/helm/nova.py | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/puppet-manifests/src/modules/openstack/manifests/nova.pp b/puppet-manifests/src/modules/openstack/manifests/nova.pp index 0ddc9ac8c0..8e2d67d407 100644 --- a/puppet-manifests/src/modules/openstack/manifests/nova.pp +++ b/puppet-manifests/src/modules/openstack/manifests/nova.pp @@ -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 + } } } diff --git a/sysinv/sysinv/sysinv/sysinv/helm/nova.py b/sysinv/sysinv/sysinv/sysinv/helm/nova.py index c0edb48482..8bed939eef 100644 --- a/sysinv/sysinv/sysinv/sysinv/helm/nova.py +++ b/sysinv/sysinv/sysinv/sysinv/helm/nova.py @@ -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'