From 6d39c90a22d850cf449f1900cff32e8b2a1803c3 Mon Sep 17 00:00:00 2001
From: Rabi Mishra <ramishra@redhat.com>
Date: Mon, 14 Dec 2020 11:42:22 +0530
Subject: [PATCH] Use RootStackName parameter instead for consistency

We don't need another parameter for the root stack and
also not required to pass it around.

This was added earlier with [1].

[1] https://review.opendev.org/openstack/tripleo-heat-templates/761845

Change-Id: I5dee09ab6c15c1887394b0dbda6866e94231f3a5
---
 network/ports/from_service.yaml    | 4 ----
 network/ports/from_service_v6.yaml | 4 ----
 network/ports/noop.yaml            | 4 ----
 network/ports/port.j2              | 7 +++----
 network/ports/port_from_pool.j2    | 4 ----
 overcloud.j2.yaml                  | 1 -
 puppet/role.role.j2.yaml           | 5 -----
 7 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/network/ports/from_service.yaml b/network/ports/from_service.yaml
index 20e0e5d286..2e257a4118 100644
--- 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
index 03a6b7da2f..7b9a29a044 100644
--- 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
index a9184e48ed..e3d6a6474a 100644
--- 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
index d86038bb19..0150a9348e 100644
--- 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
index 0d15d6b9b1..748eba64f4 100644
--- 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
index 337403dc2f..8c9c6f0d6d 100644
--- 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
index 767b14de32..9d627a5476 100644
--- 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:
           - '_'