Merge "Add neutron port tag hint for default_route_network"

This commit is contained in:
Zuul 2021-04-09 10:30:02 +00:00 committed by Gerrit Code Review
commit bdd379cfdd
3 changed files with 17 additions and 0 deletions

View File

@ -58,6 +58,11 @@ parameters:
default: delete default: delete
constraints: constraints:
- allowed_values: [delete, retain] - allowed_values: [delete, retain]
DefaultRoute:
description: >
Whether this interface is used for the default route
type: boolean
default: false
conditions: conditions:
network_is_ctlplane: network_is_ctlplane:
@ -98,6 +103,10 @@ resources:
template: tripleo_stack_name=$STACK_NAME template: tripleo_stack_name=$STACK_NAME
params: params:
$STACK_NAME: {get_param: RootStackName} $STACK_NAME: {get_param: RootStackName}
- str_replace:
template: tripleo_default_route=$BOOL
params:
$BOOL: {get_param: DefaultRoute}
outputs: outputs:
ip_address: ip_address:

View File

@ -60,6 +60,11 @@ parameters:
{%- endif %} {%- endif %}
description: Cidr for the {{network.name_lower}} network. description: Cidr for the {{network.name_lower}} network.
type: string type: string
DefaultRoute: # Here for compatibility
description: >
Whether this interface is used for the default route
type: boolean
default: false
outputs: outputs:
ip_address: ip_address:

View File

@ -338,6 +338,9 @@ resources:
{%- endif %} {%- endif %}
- {get_param: {{role.name}}IPs} - {get_param: {{role.name}}IPs}
NodeIndex: {get_param: NodeIndex} NodeIndex: {get_param: NodeIndex}
{%- if role.default_route_networks is defined and network.name in role.default_route_networks %}
DefaultRoute: true
{%- endif %}
{%- endif %} {%- endif %}
{%- endfor %} {%- endfor %}