Merge "Add tags to THT network resources" into stable/victoria
This commit is contained in:
commit
c1b65f11f3
|
@ -178,6 +178,8 @@ resources:
|
||||||
- {get_param: {{network.name}}NetValueSpecs}
|
- {get_param: {{network.name}}NetValueSpecs}
|
||||||
- {'mtu': {get_param: {{network.name}}Mtu}}
|
- {'mtu': {get_param: {{network.name}}Mtu}}
|
||||||
tags:
|
tags:
|
||||||
|
- tripleo_net_idx={{network.idx}}
|
||||||
|
- tripleo_network_name={{network.name}}
|
||||||
- tripleo_vip={{network.vip|default(false)}}
|
- tripleo_vip={{network.vip|default(false)}}
|
||||||
{%- if network.service_net_map_replace|default('') %}
|
{%- if network.service_net_map_replace|default('') %}
|
||||||
- tripleo_service_net_map_replace={{network.service_net_map_replace}}
|
- tripleo_service_net_map_replace={{network.service_net_map_replace}}
|
||||||
|
|
|
@ -158,6 +158,11 @@ def process_templates(template_path, role_data_path, output_dir,
|
||||||
if network_data is None:
|
if network_data is None:
|
||||||
network_data = []
|
network_data = []
|
||||||
|
|
||||||
|
# Set internal network index key for each network, network resources
|
||||||
|
# are created with a tag tripleo_net_idx
|
||||||
|
for idx, net in enumerate(network_data):
|
||||||
|
network_data[idx].update({'idx': idx})
|
||||||
|
|
||||||
j2_excludes = {}
|
j2_excludes = {}
|
||||||
j2_excludes_path = os.path.join(template_path, 'j2_excludes.yaml')
|
j2_excludes_path = os.path.join(template_path, 'j2_excludes.yaml')
|
||||||
if os.path.exists(j2_excludes_path):
|
if os.path.exists(j2_excludes_path):
|
||||||
|
|
Loading…
Reference in New Issue