From 9da8a405952623e42f52e13ac948da1e57cf6906 Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Mon, 28 Jun 2021 15:06:58 +0200 Subject: [PATCH] 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. Change-Id: I08fa1ee947574e6fac24885b17706a22054fcba9 Closes-Bug: #1917719 --- network/service_net_map.j2.yaml | 12 +++++++----- overcloud-resource-registry-puppet.j2.yaml | 1 - 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index bcd3387322..0edfc17c7c 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -56,13 +56,15 @@ resources: properties: type: json value: - map_replace: - - {get_param: ServiceNetMap} - - values: + map_merge: + - map_replace: + - {get_param: ServiceNetMap} + - values: {%- for network in networks if network.enabled|default(true) %} - {{network.name_lower}}: {get_param: {{network.name}}NetName} + {{network.name_lower}}: {get_param: {{network.name}}NetName} {%- endfor %} - keys: {get_param: ServiceNetMapDeprecatedMapping} + keys: {get_param: ServiceNetMapDeprecatedMapping} + - NovaVncProxyNetwork: { get_param: [ServiceNetMap, NovaLibvirtNetwork] } outputs: service_net_map: diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 35eb766ea6..8bd65bc60d 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -399,7 +399,6 @@ parameter_defaults: HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaApiNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} PlacementNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} - NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaLibvirtNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovajoinNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}