openstack/tripleo-heat-templates
Code Issues Proposed changes

Remove NovaVncProxyNetwork from ServiceNetMap

Browse Source 
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
This commit is contained in:
Martin Schuppert 2021-06-28 15:06:58 +02:00
parent 36186e9afd
commit 9da8a40595
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
network/service_net_map.j2.yaml
View File

@ -56,13 +56,15 @@ resources:
properties: properties:
type: json type: json
value: value:
map_replace: map_merge:
- map_replace:
- {get_param: ServiceNetMap} - {get_param: ServiceNetMap}
- values: - values:
{%- for network in networks if network.enabled|default(true) %} {%- 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 %} {%- endfor %}
keys: {get_param: ServiceNetMapDeprecatedMapping} keys: {get_param: ServiceNetMapDeprecatedMapping}
- NovaVncProxyNetwork: { get_param: [ServiceNetMap, NovaLibvirtNetwork] }
outputs: outputs:
service_net_map: service_net_map:

1
overcloud-resource-registry-puppet.j2.yaml
View File

@ -399,7 +399,6 @@ parameter_defaults:
HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} HeatApiCloudwatchNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
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') }}
NovaVncProxyNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }}
NovaMetadataNetwork: {{ _service_nets.get('internal_api', 'ctlplane') }} NovaMetadataNetwork: {{ _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') }}