Browse Source

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

changes/79/787979/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
538171db55
5 changed files with 19 additions and 16 deletions
  1. +1
    -1
      deployment/nova/nova-compute-container-puppet.yaml
  2. +1
    -7
      deployment/nova/nova-migration-target-container-puppet.yaml
  3. +7
    -7
      deployment/nova/nova-vnc-proxy-container-puppet.yaml
  4. +0
    -1
      network/service_net_map.j2.yaml
  5. +10
    -0
      releasenotes/notes/nova_novnc_network-83a1479bf227f867.yaml

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

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


+ 1
- 7
deployment/nova/nova-migration-target-container-puppet.yaml View File

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


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

@ -175,7 +175,7 @@ outputs:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
$NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
tripleo::nova_vnc_proxy::firewall_rules:
'137 nova_vnc_proxy':
dport:
@ -214,12 +214,12 @@ outputs:
str_replace:
template: "%{hiera('fqdn_NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
principal:
str_replace:
template: "libvirt-vnc/%{hiera('fqdn_NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
key_size:
if:
- key_size_libvirtvnc_override_unset
@ -232,12 +232,12 @@ outputs:
str_replace:
template: "%{hiera('fqdn_NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
principal:
str_replace:
template: "novnc-proxy/%{hiera('fqdn_NETWORK')}"
params:
NETWORK: {get_param: [ServiceNetMap, NovaApiNetwork]}
NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
key_size:
if:
- key_size_novavnc_override_unset
@ -324,10 +324,10 @@ outputs:
- use_tls_for_vnc
-
- service: libvirt-vnc
network: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
type: node
- service: novnc-proxy
network: {get_param: [ServiceNetMap, NovaApiNetwork]}
network: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
type: node
- null
deploy_steps_tasks:


+ 0
- 1
network/service_net_map.j2.yaml View File

@ -57,7 +57,6 @@ parameters:
NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
PlacementNetwork: {{ _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') }}
NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
Ec2ApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}


+ 10
- 0
releasenotes/notes/nova_novnc_network-83a1479bf227f867.yaml 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.

Loading…
Cancel
Save