Expose the novncproxy port
The novncproxy would be available at the OAMIP:30680.
Test pass on simplex setup.
VM console can be accessed through horizon.
Closes-bug: 1827246
Depends-on: https://review.opendev.org/#/c/684443/
Change-Id: I6c450d391a8842d8336a0085dc31f939cb8789d9
Signed-off-by: zhipengl <zhipengs.liu@intel.com>
(cherry picked from commit f8ec30d0c6
)
This commit is contained in:
parent
1179f44e5e
commit
707cdd9d68
|
@ -910,6 +910,8 @@ data:
|
|||
# here.
|
||||
mandatory_access_control:
|
||||
type: null
|
||||
useHostNetwork:
|
||||
novncproxy: false
|
||||
replicas:
|
||||
api_metadata: 1
|
||||
osapi: 1
|
||||
|
|
|
@ -49,6 +49,7 @@ class NovaHelm(openstack.OpenstackBaseHelm):
|
|||
AUTH_USERS = ['nova', ]
|
||||
SERVICE_USERS = ['neutron', 'ironic', 'placement']
|
||||
NOVNCPROXY_SERVICE_NAME = 'novncproxy'
|
||||
NOVNCPROXY_NODE_PORT = '30680'
|
||||
|
||||
def get_overrides(self, namespace=None):
|
||||
|
||||
|
@ -98,6 +99,11 @@ class NovaHelm(openstack.OpenstackBaseHelm):
|
|||
'network': {
|
||||
'sshd': {
|
||||
'from_subnet': self._get_ssh_subnet(),
|
||||
},
|
||||
'novncproxy': {
|
||||
'node_port': {
|
||||
'enabled': self._get_network_node_port_overrides()
|
||||
}
|
||||
}
|
||||
},
|
||||
'ceph_client': self._get_ceph_client_overrides(),
|
||||
|
@ -196,9 +202,8 @@ class NovaHelm(openstack.OpenstackBaseHelm):
|
|||
location = "%s.%s" % (self.NOVNCPROXY_SERVICE_NAME,
|
||||
str(endpoint_domain.value).lower())
|
||||
else:
|
||||
location = self._get_service_default_dns_name(
|
||||
self.NOVNCPROXY_SERVICE_NAME)
|
||||
|
||||
location = "%s:%s" % (self._get_oam_address(),
|
||||
self.NOVNCPROXY_NODE_PORT)
|
||||
url = "%s://%s/vnc_auto.html" % (self._get_public_protocol(),
|
||||
location)
|
||||
return url
|
||||
|
@ -576,3 +581,15 @@ class NovaHelm(openstack.OpenstackBaseHelm):
|
|||
}
|
||||
|
||||
return ephemeral_storage_conf
|
||||
|
||||
def _get_network_node_port_overrides(self):
|
||||
# If openstack endpoint FQDN is configured, disable node_port 30680
|
||||
# which will enable the Ingress for the novncproxy service
|
||||
endpoint_fqdn = self._get_service_parameter(
|
||||
constants.SERVICE_TYPE_OPENSTACK,
|
||||
constants.SERVICE_PARAM_SECTION_OPENSTACK_HELM,
|
||||
constants.SERVICE_PARAM_NAME_ENDPOINT_DOMAIN)
|
||||
if endpoint_fqdn:
|
||||
return False
|
||||
else:
|
||||
return True
|
||||
|
|
Loading…
Reference in New Issue