Merge "Use single NovaLibvirtNetwork to configure instance console components" into stable/ussuri
This commit is contained in:
commit
0afe16770c
|
@ -896,7 +896,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]}
|
||||||
|
|
|
@ -129,13 +129,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:
|
||||||
|
|
|
@ -195,7 +195,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
|
||||||
|
@ -231,12 +231,12 @@ outputs:
|
||||||
str_replace:
|
str_replace:
|
||||||
template: "%{hiera('fqdn_NETWORK')}"
|
template: "%{hiera('fqdn_NETWORK')}"
|
||||||
params:
|
params:
|
||||||
NETWORK: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
|
NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
|
||||||
principal:
|
principal:
|
||||||
str_replace:
|
str_replace:
|
||||||
template: "libvirt-vnc/%{hiera('fqdn_NETWORK')}"
|
template: "libvirt-vnc/%{hiera('fqdn_NETWORK')}"
|
||||||
params:
|
params:
|
||||||
NETWORK: {get_param: [ServiceNetMap, NovaVncProxyNetwork]}
|
NETWORK: {get_param: [ServiceNetMap, NovaLibvirtNetwork]}
|
||||||
key_size:
|
key_size:
|
||||||
if:
|
if:
|
||||||
- key_size_libvirtvnc_override_unset
|
- key_size_libvirtvnc_override_unset
|
||||||
|
@ -249,12 +249,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
|
||||||
|
@ -342,10 +342,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:
|
||||||
|
|
|
@ -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') }}
|
||||||
|
|
|
@ -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…
Reference in New Issue