From 2aace23d2386bcc777d4f6984553a4a5a5cb8483 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Tue, 8 Sep 2020 13:20:39 +0200
Subject: [PATCH] Add tag's with network_data info to neutron net

Working on a tool to extract deployed networks from an existing
heat stack, adding this information so that it's available for
export.

Also when (if) we remove OS::Neutron::Net, OS::Neutron::Subnet
resources from THT storing this state in the neutron networks
will make it possible to recreate network_data in case the file
is deleted.

Depends-On: https://review.opendev.org/750662
Change-Id: I696afb8f24cc2fdeb17aaef1d3bc3a5fc22a8dcd
---
 network/network.j2 | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/network/network.j2 b/network/network.j2
index 9dc37f8af4..f8115fef63 100644
--- a/network/network.j2
+++ b/network/network.j2
@@ -63,12 +63,10 @@ parameters:
 {%- endif %}
     description: default route for the {{network.name_lower}} network
     type: string
-{%- if network.vlan %}
   {{network.name}}NetworkVlanID:
     default: {{network.vlan|default(1)}}
     description: Vlan ID for the {{network.name_lower}} network traffic.
     type: number
-{%- endif %}
   {{network.name}}Routes:
     default: {{network.routes|default([])}}
     description: >
@@ -170,6 +168,14 @@ resources:
         map_merge:
           - {get_param: {{network.name}}NetValueSpecs}
           - {'mtu': {get_param: {{network.name}}Mtu}}
+      tags:
+        - tripleo_vip={{network.vip|default(false)}}
+{%- if network.service_net_map_replace|default('') %}
+        - tripleo_service_net_map_replace={{network.service_net_map_replace}}
+{%- endif %}
+{%- if network.ipv6 or ipv6_override %}
+        - tripleo_ipv6=true
+{%- endif %}
 
   {{network.name}}Subnet:
     type: OS::Neutron::Subnet
@@ -193,6 +199,11 @@ resources:
 {%- else %}
       enable_dhcp: {get_param: {{network.name}}NetEnableDHCP}
 {%- endif %}
+      tags:
+        - str_replace:
+            template: tripleo_vlan_id=$vlan_id
+            params:
+              $vlan_id: {get_param: {{network.name}}NetworkVlanID}
 
 
 {% for subnet in network.subnets|default({}) if network.subnets[subnet].enabled|default(true) %}
@@ -234,6 +245,11 @@ resources:
 {%- else %}
       enable_dhcp: {get_param: {{network.name}}NetEnableDHCP}
 {%- endif %}
+      tags:
+        - str_replace:
+            template: tripleo_vlan_id=$vlan_id
+            params:
+              $vlan_id: {get_param: {{network.name}}NetworkVlanID_{{subnet}}}
 
 {% endfor %}