openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove NovaVncProxyNetwork from ServiceNetMap"

This commit is contained in:
Zuul 2021-06-29 09:35:35 +00:00 committed by Gerrit Code Review
parent ead0d148aa 9da8a40595
commit b7f7b70c1c
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:
type: json
value:
map_replace:
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}
{%- endfor %}
keys: {get_param: ServiceNetMapDeprecatedMapping}
- NovaVncProxyNetwork: { get_param: [ServiceNetMap, NovaLibvirtNetwork] }
outputs:
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') }}
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') }}