Browse Source

Merge "Add tags to THT network resources" into stable/victoria

changes/40/793940/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
c1b65f11f3
2 changed files with 7 additions and 0 deletions
  1. +2
    -0
      network/network.j2
  2. +5
    -0
      tools/process-templates.py

+ 2
- 0
network/network.j2 View File

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


+ 5
- 0
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):


Loading…
Cancel
Save