Merge "Use RootStackName parameter instead for consistency"

This commit is contained in:
Zuul 2021-01-12 06:02:27 +00:00 committed by Gerrit Code Review
commit cf9fb8c848
7 changed files with 3 additions and 26 deletions

View File

@ -4,10 +4,6 @@ description: >
Returns an IP from a service mapped list of IPs
parameters:
StackName: # Here for compatibility
description: Name of the overcloud heat stack
default: overcloud
type: string
ServiceName:
description: Name of the service to lookup
default: ''

View File

@ -4,10 +4,6 @@ description: >
Returns an IP from a service mapped list of IPv6 IPs
parameters:
StackName: # Here for compatibility
description: Name of the overcloud heat stack
default: overcloud
type: string
ServiceName:
description: Name of the service to lookup
default: ''

View File

@ -4,10 +4,6 @@ description: >
Returns the control plane port (provisioning network) as the ip_address.
parameters:
StackName: # Here for compatibility
description: Name of the overcloud heat stack
default: overcloud
type: string
ServiceName: # Here for compatibility with from_service.yaml
description: Name of the service to lookup
default: ''

View File

@ -5,9 +5,8 @@ description: >
automatically if FixedIPs is empty.
parameters:
StackName:
description: Name of the overcloud heat stack
default: overcloud
RootStackName:
description: The name of the stack/plan.
type: string
{{network.name}}NetName:
description: The name of the {{network.name_lower}} network.
@ -93,7 +92,7 @@ resources:
- str_replace:
template: tripleo_stack_name=$STACK_NAME
params:
$STACK_NAME: {get_param: StackName}
$STACK_NAME: {get_param: RootStackName}
outputs:
ip_address:

View File

@ -10,10 +10,6 @@ description: >
- 1.2.3.5 # Second controller
parameters:
StackName: # Here for compatibility
description: Name of the overcloud heat stack
default: overcloud
type: string
{{network.name}}NetName:
description: The name of the {{network.name_lower}} network.
default: {{network.name_lower}}

View File

@ -823,7 +823,6 @@ resources:
resource_def:
type: OS::TripleO::{{role.name}}
properties:
StackName: {get_param: 'OS::stack_name'}
CloudDomain: {get_param: CloudDomain}
ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
EndpointMap: {get_attr: [EndpointMapData, value]}

View File

@ -5,10 +5,6 @@
heat_template_version: rocky
description: 'OpenStack {{role.name}} node configured by Puppet'
parameters:
StackName:
description: Name of the overcloud heat stack
default: overcloud
type: string
{%- set default_flavor_name = role.FlavorDefault|default('baremetal') %}
{%- if role.deprecated_param_flavor is defined %}
{{role.deprecated_param_flavor}}:
@ -304,7 +300,6 @@ resources:
{{network.name}}Port:
type: OS::TripleO::{{role.name}}::Ports::{{network.name}}Port
properties:
StackName: {get_param: StackName}
PortName:
list_join:
- '_'