From acd41a60836858de5d2e686acb48987b025c9ebd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Harald=20Jens=C3=A5s?= <hjensas@redhat.com>
Date: Mon, 25 Jan 2021 22:59:20 +0100
Subject: [PATCH] Add neutron port tag hint for role name

Adds a tag tripleo_role=$ROLE to neutron ports
created by heat.

Related: blueprint network-data-v2-ports
Change-Id: I238572444e2931546d44864b2de497dd2825c2dc
(cherry picked from commit 659cc552772241ba95cbd7ea809040606f162b13)
---
 deployed-server/deployed-neutron-port.yaml | 5 +++++
 network/ports/deployed_port.j2             | 5 +++++
 network/ports/noop.yaml                    | 5 +++++
 network/ports/port.j2                      | 9 +++++++++
 network/ports/port_from_pool.j2            | 5 +++++
 puppet/role.role.j2.yaml                   | 1 +
 6 files changed, 30 insertions(+)

diff --git a/deployed-server/deployed-neutron-port.yaml b/deployed-server/deployed-neutron-port.yaml
index 9ee87af161..d1bd2e0fc5 100644
--- a/deployed-server/deployed-neutron-port.yaml
+++ b/deployed-server/deployed-neutron-port.yaml
@@ -42,6 +42,11 @@ parameters:
   IsVirtualIP:  # Here for compatibility
     default: false
     type: boolean
+  Role: # Here for compatibility
+    description: >
+      The TripleO Role Name
+    type: string
+    default: ''
 
 
 outputs:
diff --git a/network/ports/deployed_port.j2 b/network/ports/deployed_port.j2
index d8e831ef30..b4ffcf8068 100644
--- a/network/ports/deployed_port.j2
+++ b/network/ports/deployed_port.j2
@@ -59,6 +59,11 @@ parameters:
       Whether this interface is used for the default route
     type: boolean
     default: false
+  Role: # Here for compatibility
+    description: >
+      The TripleO Role Name
+    type: string
+    default: ''
 
 resources:
 
diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml
index 305ad94035..3cd7472880 100644
--- a/network/ports/noop.yaml
+++ b/network/ports/noop.yaml
@@ -65,6 +65,11 @@ parameters:
       Whether this interface is used for the default route
     type: boolean
     default: false
+  Role: # Here for compatibility
+    description: >
+      The TripleO Role Name
+    type: string
+    default: ''
 
 outputs:
   ip_address:
diff --git a/network/ports/port.j2 b/network/ports/port.j2
index 8e1a1a07e2..c58fafaaec 100644
--- a/network/ports/port.j2
+++ b/network/ports/port.j2
@@ -66,6 +66,11 @@ parameters:
   IsVirtualIP:
     type: boolean
     default: false
+  Role:
+    description: >
+      The TripleO Role Name
+    type: string
+    default: ''
 
 conditions:
   network_is_ctlplane:
@@ -120,6 +125,10 @@ resources:
               template: tripleo_default_route=$BOOL
               params:
                 $BOOL: {get_param: DefaultRoute}
+          - str_replace:
+              template: tripleo_role=$ROLE
+              params:
+                $ROLE: {get_param: Role}
 
 outputs:
   ip_address:
diff --git a/network/ports/port_from_pool.j2 b/network/ports/port_from_pool.j2
index 820ab607a4..73e5258e9c 100644
--- a/network/ports/port_from_pool.j2
+++ b/network/ports/port_from_pool.j2
@@ -68,6 +68,11 @@ parameters:
   IsVirtualIP:  # Here for compatibility
     default: false
     type: boolean
+  Role: # Here for compatibility
+    description: >
+      The TripleO Role Name
+    type: string
+    default: ''
 
 outputs:
   ip_address:
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
index 53c8eb9e5b..fa0bb8c7ea 100644
--- a/puppet/role.role.j2.yaml
+++ b/puppet/role.role.j2.yaml
@@ -341,6 +341,7 @@ resources:
 {%- if role.default_route_networks is defined and network.name in role.default_route_networks %}
       DefaultRoute: true
 {%- endif %}
+      Role: {{role.name}}
   {%- endif %}
   {%- endfor %}