openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Use single NovaLibvirtNetwork to configure instance console components" into stable/victoria

This commit is contained in:
Zuul 2021-03-30 00:42:55 +00:00 committed by Gerrit Code Review
parent 856e745276 05b191d3e6
commit 50ee8c1cba
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -902,7 +902,7 @@ outputs:
template: template:
"%{hiera('$NETWORK')}" "%{hiera('$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, NovaVncProxyNetwork]} $NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host_nobrackets]} nova::compute::vncproxy_host: {get_param: [EndpointMap, NovaPublic, host_nobrackets]}
nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyCellPublic, protocol]} nova::vncproxy::common::vncproxy_protocol: {get_param: [EndpointMap, NovaVNCProxyCellPublic, protocol]}
nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyCellPublic, host_nobrackets]} nova::vncproxy::common::vncproxy_host: {get_param: [EndpointMap, NovaVNCProxyCellPublic, host_nobrackets]}

8
deployment/nova/nova-migration-target-container-puppet.yaml
View File

@ -105,13 +105,7 @@ outputs:
template: template:
"%{hiera('$NETWORK')}" "%{hiera('$NETWORK')}"
params: params:
$NETWORK: $NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
get_param:
- ServiceNetMap
- str_replace:
template: "ROLENAMEHostnameResolveNetwork"
params:
ROLENAME: {get_param: RoleName}
cold_migration_ssh_inbound_addr: cold_migration_ssh_inbound_addr:
str_replace: str_replace:
template: template:

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

@ -200,7 +200,7 @@ outputs:
template: template:
"%{hiera('$NETWORK')}" "%{hiera('$NETWORK')}"
params: params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]} $NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
- -
if: if:
- use_tls_for_vnc - use_tls_for_vnc
@ -258,12 +258,12 @@ outputs:
str_replace: str_replace:
template: "%{hiera('fqdn_NETWORK')}" template: "%{hiera('fqdn_NETWORK')}"
params: params:
NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]} NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
principal: principal:
str_replace: str_replace:
template: "novnc-proxy/%{hiera('fqdn_NETWORK')}" template: "novnc-proxy/%{hiera('fqdn_NETWORK')}"
params: params:
NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]} NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
key_size: key_size:
if: if:
- key_size_novavnc_override_unset - key_size_novavnc_override_unset
@ -351,10 +351,10 @@ outputs:
- use_tls_for_vnc - use_tls_for_vnc
- -
- service: libvirt-vnc - service: libvirt-vnc
network: {get_param: [ServiceNetMap, NovaVncProxyNetwork]} network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
type: node type: node
- service: novnc-proxy - service: novnc-proxy
network: {get_param: [ServiceNetMap, NovaApiNetwork]} network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
type: node type: node
- null - null
deploy_steps_tasks: deploy_steps_tasks:

1
network/service_net_map.j2.yaml
View File

@ -56,7 +56,6 @@ parameters:
NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
PlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} PlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
NovaLibvirtNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaLibvirtNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }} SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}

10
releasenotes/notes/nova_novnc_network-83a1479bf227f867.yaml Normal file
View File

@ -0,0 +1,10 @@
---
fixes:
- |
Nova vnc configuration right now uses NovaVncProxyNetwork, NovaLibvirtNetwork
and NovaApiNetwork to configure the different components (novnc proxy,
nova-compute and libvirt) for vnc. If one of the networks get changed from
internal_api, the service configuration between libvirt, nova-compute and
novnc proxy gets inconsistent and the console is broken.
This changed to just use NovaLibvirtNetwork for configuring the vnc endpoints
and removes NovaVncProxyNetwork completely.