Browse Source

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

changes/75/793275/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
b2231d4481
6 changed files with 30 additions and 0 deletions
  1. +5
    -0
      deployed-server/deployed-neutron-port.yaml
  2. +5
    -0
      network/ports/deployed_port.j2
  3. +5
    -0
      network/ports/noop.yaml
  4. +9
    -0
      network/ports/port.j2
  5. +5
    -0
      network/ports/port_from_pool.j2
  6. +1
    -0
      puppet/role.role.j2.yaml

+ 5
- 0
deployed-server/deployed-neutron-port.yaml View File

@ -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
- 0
network/ports/deployed_port.j2 View File

@ -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
- 0
network/ports/noop.yaml View File

@ -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
- 0
network/ports/port.j2 View File

@ -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
- 0
network/ports/port_from_pool.j2 View File

@ -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
- 0
puppet/role.role.j2.yaml View File

@ -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