Remove NovaVncProxyNetwork from ServiceNetMap
In Icef2481b65b41b524ad44eeecfbee4451006e1d2 we moved to use NovaLibvirtNetwork as the single network to configure instance console components. Due to how hieradata is being rendered via tripleo-hieradata, the removed NovaVncProxyNetwork resulted in no-vnc-proxy service to fall back to the control plane network because NovaVncProxyNetwork was removed. NovaVncProxyNetwork was then reintroduced with I595294956a4a7a0e2280c685ac1d2543edbc32f2 but as a side effect again introduced the inconsistency on the console configuration. This patch removes the NovaVncProxyNetwork from ServiceNetMap but set it as part of service_net_map.j2.yaml and keep it in sync with NovaLibvirtNetwork. Conflicts: network/service_net_map.j2.yaml overcloud-resource-registry-puppet.j2.yaml Change-Id: I08fa1ee947574e6fac24885b17706a22054fcba9 Closes-Bug: #1917719 (cherry picked from commit9da8a40595
) (cherry picked from commit2f0689d8d7
) (cherry picked from commitd18c6e9283
)
This commit is contained in:
parent
a2421ef475
commit
de54e5ab63
|
@ -56,7 +56,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') }}
|
||||
SwiftStorageNetwork: {{ _service_nets.get('storage_mgmt', 'ctlplane') }}
|
||||
|
@ -172,6 +171,12 @@ resources:
|
|||
{%- for network in networks if network.enabled|default(true) %}
|
||||
{{network.name_lower}}: {get_param: {{network.name}}NetName}
|
||||
{%- endfor %}
|
||||
- if:
|
||||
# (mschuppert) this is to keep NovaVncProxyNetwork and NovaLibvirtNetwork
|
||||
# in sync to not break VNC console
|
||||
- not: {equals : [{get_param: [ServiceNetMap, NovaLibvirtNetwork]}, '']}
|
||||
- NovaVncProxyNetwork: { get_param: [ServiceNetMap, NovaLibvirtNetwork] }
|
||||
- NovaVncProxyNetwork: { get_param: [ServiceNetMapDefaults, NovaLibvirtNetwork] }
|
||||
- map_replace:
|
||||
- {get_param: ServiceNetMap}
|
||||
- keys: {get_param: ServiceNetMapDeprecatedMapping}
|
||||
|
|
Loading…
Reference in New Issue