Skip to content
This repository has been archived by the owner on Feb 29, 2024. It is now read-only.

Commit

Permalink
Add an index tag on neutron network resources
Browse files Browse the repository at this point in the history
When using the multiple nic-config templates in THT
and in tripleo-ansible the ordering of networks in
the network_data file matters.

Add a a tag 'tripleo_net_idx' to neutron resources
to keep track of the ordering.

Depends-On: https://review.opendev.org/772795
Partial-Implements: blueprint network-data-v2-ports
Change-Id: I0d39ea713ce1201b60f3def69f453792e402eb33
  • Loading branch information
hjensas committed Jan 28, 2021
1 parent c488d97 commit 2d0125e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions network/network.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down
5 changes: 5 additions & 0 deletions tools/process-templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down

0 comments on commit 2d0125e

Please sign in to comment.