Merge "Fix haproxy/novnc interaction in containers setup"
This commit is contained in:
commit
977112e99e
|
@ -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,8 +588,10 @@ class openstack::nova::api
|
|||
|
||||
if $::openstack::nova::params::configure_endpoint {
|
||||
include ::openstack::nova::firewall
|
||||
if $::platform::kubernetes::params::enabled != true {
|
||||
include ::openstack::nova::haproxy
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue