From 2d0125ed4023eb7c524d09a0e5865e8d3e22a492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 28 Jan 2021 02:02:59 +0100 Subject: [PATCH] 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. Depends-On: https://review.opendev.org/772795 Partial-Implements: blueprint network-data-v2-ports Change-Id: I0d39ea713ce1201b60f3def69f453792e402eb33 --- network/network.j2 | 1 + tools/process-templates.py | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/network/network.j2 b/network/network.j2 index da8e2482b0..767ed5661d 100644 --- a/network/network.j2 +++ b/network/network.j2 @@ -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}} diff --git a/tools/process-templates.py b/tools/process-templates.py index fcbcf69dce..9fdc9b1ec3 100755 --- a/tools/process-templates.py +++ b/tools/process-templates.py @@ -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):