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

Commit

Permalink
Add tags to THT network resources
Browse files Browse the repository at this point in the history
This combines several changes that added tags to
network resources into one commit.

Add an index tag on neutron network resources

  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.

Add tripleo_network_name tag hint to networks

  The ansible module to manage networks sets the name
  upper as a tag hint on the neutron network resources.
  tripleo_ansible/ansible_plugins/modules/tripleo_composable_network.py#L124

  This change adds this tag for Heat managed networks as well.

Depends-On: https://review.opendev.org/792196
Partial-Implements: blueprint network-data-v2-ports
(cherry picked from commit 2d0125e)
(cherry picked from commit 70dc61c)
Change-Id: I08b98e9daa625c7c81e50a8ba67bcfc91af37cf0
  • Loading branch information
hjensas committed May 19, 2021
1 parent e361984 commit cf17ac9
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
2 changes: 2 additions & 0 deletions network/network.j2
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
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 cf17ac9

Please sign in to comment.