starlingx
/
config
Code Issues Proposed changes

Merge "Fix haproxy/novnc interaction in containers setup"

This commit is contained in:
Zuul 2018-12-04 06:32:51 +00:00 committed by Gerrit Code Review
parent a35ab297d9 8d4b249723
commit 977112e99e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
puppet-manifests/src/modules/openstack/manifests/nova.pp
View File

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

1
sysinv/sysinv/sysinv/sysinv/helm/nova.py
View File

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