Merge "Use RootStackName parameter instead for consistency"

openstack-archive · Jan 12, 2021 · cf9fb8c · cf9fb8c
2 parents 6246e5a + 6d39c90
commit cf9fb8c
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 26 deletions.
diff --git a/network/ports/from_service.yaml b/network/ports/from_service.yaml
@@ -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: ''

diff --git a/network/ports/from_service_v6.yaml b/network/ports/from_service_v6.yaml
@@ -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: ''

diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml
@@ -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: ''

diff --git a/network/ports/port.j2 b/network/ports/port.j2
@@ -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:

diff --git a/network/ports/port_from_pool.j2 b/network/ports/port_from_pool.j2
@@ -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}}

diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
@@ -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]}

diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml
@@ -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:
           - '_'