openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Add an index tag on neutron network resources"

This commit is contained in:
Zuul 2021-02-03 12:59:10 +00:00 committed by Gerrit Code Review
parent 2338efd746 2d0125ed40
commit 125f458202
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
network/network.j2
View File

@ -178,6 +178,7 @@ resources:
- {get_param: {{network.name}}NetValueSpecs}
- {'mtu': {get_param: {{network.name}}Mtu}}
tags:
- tripleo_net_idx={{network.idx}}
- tripleo_vip={{network.vip|default(false)}}
{%- if network.service_net_map_replace|default('') %}
- tripleo_service_net_map_replace={{network.service_net_map_replace}}

5
tools/process-templates.py
View File

@ -158,6 +158,11 @@ def process_templates(template_path, role_data_path, output_dir,
if network_data is None:
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_path = os.path.join(template_path, 'j2_excludes.yaml')
if os.path.exists(j2_excludes_path):