Merge "Add neutron port tag hint for role name" into stable/wallaby

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:

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:
 

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:

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:

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:

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 %}