Browse Source

Add novnc proxy to cellsv2 multicell controller

With cellsv2 multicell in each cell there needs to be a novnc proxy as the
console token is stored in the cell conductor database. This change adds
the NovaVncProxy service to the CellController role and configures the
endpoint to the local public address of the cell.

Closes-Bug: #1822607
Depends-On: https://review.openstack.org/649265

Change-Id: Ia3a36d369fdc18685f4c965a9e371ca3143967bf
Martin Schuppert 3 weeks ago
parent
commit
ffa6810e49

+ 3
- 3
deployment/nova/nova-compute-container-puppet.yaml View File

@@ -424,9 +424,9 @@ outputs:
424 424
                 params:
425 425
                   $NETWORK: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
426 426
             nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host_nobrackets]}
427
-            nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]}
428
-            nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyPublic, host_nobrackets]}
429
-            nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]}
427
+            nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyCellPublic, protocol]}
428
+            nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyCellPublic, host_nobrackets]}
429
+            nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyCellPublic, port]}
430 430
             nova::compute::verify_glance_signatures: {get_param: [VerifyGlanceSignatures]}
431 431
             # if libvirt_file_backed_memory_enabled we have to set ram_allocation_ratio to 1.0
432 432
             nova::ram_allocation_ratio:

+ 3
- 3
deployment/nova/nova-vnc-proxy-container-puppet.yaml View File

@@ -127,9 +127,9 @@ outputs:
127 127
         map_merge:
128 128
           - {get_attr: [NovaLogging, config_settings]}
129 129
           - nova::vncproxy::enabled: true
130
-            nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyPublic, protocol]}
131
-            nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyPublic, host_nobrackets]}
132
-            nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyPublic, port]}
130
+            nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyCellPublic, protocol]}
131
+            nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyCellPublic, host_nobrackets]}
132
+            nova::vncproxy::common::vncproxy_port: {get_param: [EndpointMap, NovaVNCProxyCellPublic, port]}
133 133
             # NOTE: bind IP is found in hiera replacing the network name with the local node IP
134 134
             # for the given network; replacement examples (eg. for internal_api):
135 135
             # internal_api -> IP

+ 1
- 0
overcloud.j2.yaml View File

@@ -391,6 +391,7 @@ resources:
391 391
           - {get_attr: [EndpointMap, endpoint_map]}
392 392
           - {get_param: EndpointMapOverride}
393 393
           - MysqlCellInternal: {get_attr: [EndpointMap, endpoint_map, MysqlInternal]}
394
+          - NovaVNCProxyCellPublic: {get_attr: [EndpointMap, endpoint_map, NovaVNCProxyPublic]}
394 395
 
395 396
   SshKnownHostsConfig:
396 397
     type: OS::TripleO::Ssh::KnownHostsConfig

+ 7
- 0
releasenotes/notes/nova_novnc_proxy_per_cell-f2d0c50d3c21c46c.yaml View File

@@ -0,0 +1,7 @@
1
+---
2
+fixes:
3
+  - |
4
+    With cellsv2 multicell in each cell there needs to be a novnc proxy as the
5
+    console token is stored in the cell conductor database. This change adds
6
+    the NovaVncProxy service to the CellController role and configures the
7
+    endpoint to the local public address of the cell.

+ 1
- 0
roles/CellController.yaml View File

@@ -37,6 +37,7 @@
37 37
     - OS::TripleO::Services::MySQL
38 38
     - OS::TripleO::Services::MySQLClient
39 39
     - OS::TripleO::Services::NovaConductor
40
+    - OS::TripleO::Services::NovaVncProxy
40 41
     - OS::TripleO::Services::Ntp
41 42
     - OS::TripleO::Services::ContainersLogrotateCrond
42 43
     - OS::TripleO::Services::Pacemaker

Loading…
Cancel
Save