Merge "Remove NovaVncProxyNetwork from ServiceNetMap" into stable/wal…

…laby

network/service_net_map.j2.yaml

@@ -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') }}
@@ -175,6 +174,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}