Merge "Handle any network name in ServiceNetMap" into stable/queens
This commit is contained in:
commit
57b3fac534
|
@ -1,22 +1,9 @@
|
||||||
{%- set _service_nets = {} -%}
|
{%- set _service_nets = {} -%}
|
||||||
{%- for network in networks if network.enabled|default(true) -%}
|
{%- for network in networks if network.enabled|default(true) -%}
|
||||||
{%- if network.name == 'InternalApi' -%}
|
{%- if network.service_net_map_replace is defined -%}
|
||||||
{%- set _service_nets = _service_nets.update({'internal_api': 'internal_api'}) -%}
|
{%- set _service_nets = _service_nets.update({network.service_net_map_replace:network.name_lower}) -%}
|
||||||
{%- endif -%}
|
{%- else -%}
|
||||||
{%- if network.name == 'External' -%}
|
{%- set _service_nets = _service_nets.update({network.name_lower:network.name_lower}) -%}
|
||||||
{%- set _service_nets = _service_nets.update({'external': 'external'}) -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- if network.name == 'Tenant' -%}
|
|
||||||
{%- set _service_nets = _service_nets.update({'tenant': 'tenant'}) -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- if network.name == 'Storage' -%}
|
|
||||||
{%- set _service_nets = _service_nets.update({'storage': 'storage'}) -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- if network.name == 'StorageMgmt' -%}
|
|
||||||
{%- set _service_nets = _service_nets.update({'storage_mgmt': 'storage_mgmt'}) -%}
|
|
||||||
{%- endif -%}
|
|
||||||
{%- if network.name == 'StorageNFS' -%}
|
|
||||||
{%- set _service_nets = _service_nets.update({'storage_nfs': 'storage_nfs'}) -%}
|
|
||||||
{%- endif -%}
|
{%- endif -%}
|
||||||
{%- endfor -%}
|
{%- endfor -%}
|
||||||
heat_template_version: queens
|
heat_template_version: queens
|
||||||
|
@ -148,12 +135,8 @@ resources:
|
||||||
- map_replace:
|
- map_replace:
|
||||||
- {get_param: ServiceNetMapDefaults}
|
- {get_param: ServiceNetMapDefaults}
|
||||||
- values:
|
- values:
|
||||||
{%- for network in networks %}
|
{%- for network in networks if network.enabled|default(true) %}
|
||||||
{%- if network.service_net_map_replace is defined %}
|
|
||||||
{{network.service_net_map_replace}}: {{network.name_lower}}
|
|
||||||
{%- else %}
|
|
||||||
{{network.name_lower}}: {get_param: {{network.name}}NetName}
|
{{network.name_lower}}: {get_param: {{network.name}}NetName}
|
||||||
{%- endif %}
|
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
- map_replace:
|
- map_replace:
|
||||||
- {get_param: ServiceNetMap}
|
- {get_param: ServiceNetMap}
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- ServiceNetMap now handles any network name when computing the default
|
||||||
|
network for each service in ServiceNetMapDefaults.
|
Loading…
Reference in New Issue