Merge "Remove NovaVncProxyNetwork from ServiceNetMap"
This commit is contained in:
commit
b7f7b70c1c
|
@ -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:
|
||||
|
|
|
@ -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') }}
|
||||
|
|
Loading…
Reference in New Issue