Browse Source

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 659cc55277)
changes/14/792514/1
Harald Jensås 8 months ago
parent
commit
acd41a6083
  1. 5
      deployed-server/deployed-neutron-port.yaml
  2. 5
      network/ports/deployed_port.j2
  3. 5
      network/ports/noop.yaml
  4. 9
      network/ports/port.j2
  5. 5
      network/ports/port_from_pool.j2
  6. 1
      puppet/role.role.j2.yaml

5
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:

5
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:

5
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:

9
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:

5
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:

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

Loading…
Cancel
Save