From dbb0224e3715d2154918b7a193aab4e43842921e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Thu, 20 Oct 2022 14:55:05 +0900
Subject: [PATCH] Remove old workaround to upgrade deployed server environment

This change removes the old workaround added by [1]. This workaround is
no longer required since we replaced undercloud heat by ephemeral heat.
Now the overcloud stack is ephemeral and neutron ports should be
pre-allocated instead of being created/managed by heat.

[1] 6f20304c43bd010f656e9000f098d1d5d02cdc78

Change-Id: I88526e4c4faabe5f7291ae790a21039c0736c41f
---
 deployed-server/ctlplane-port.yaml            | 47 -------------------
 .../update-from-deployed-server-newton.yaml   |  2 -
 2 files changed, 49 deletions(-)
 delete mode 100644 deployed-server/ctlplane-port.yaml
 delete mode 100644 environments/updates/update-from-deployed-server-newton.yaml

diff --git a/deployed-server/ctlplane-port.yaml b/deployed-server/ctlplane-port.yaml
deleted file mode 100644
index 6cbfd73a3d..0000000000
--- a/deployed-server/ctlplane-port.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-heat_template_version: wallaby
-
-parameters:
-  RootStackName:
-    description: The name of the stack/plan.
-    type: string
-  network:
-    type: string
-    default: ctlplane
-  fixed_ips:
-    default: []
-    type: json
-  name:
-    type: string
-  dns_name:
-    default: ''
-    type: string
-  replacement_policy:
-    type: string
-    default: AUTO
-  ControlPlaneSubnet:
-    default: ctlplane-subnet
-    description: The name of the undercloud Neutron control plane subnet
-    type: string
-
-resources:
-
-  ControlPlanePort:
-    type: OS::Neutron::Port
-    properties:
-      network: ctlplane
-      fixed_ips: [{subnet: {get_param: ControlPlaneSubnet}}]
-      name:
-        list_join:
-          - '-'
-          - - {get_param: name}
-            - port
-      replacement_policy: AUTO
-      tags:
-        - str_replace:
-            template: tripleo_stack_name=$STACK_NAME
-            params:
-              $STACK_NAME: {get_param: RootStackName}
-
-outputs:
-  fixed_ips:
-    value: {get_attr: [ControlPlanePort, fixed_ips]}
diff --git a/environments/updates/update-from-deployed-server-newton.yaml b/environments/updates/update-from-deployed-server-newton.yaml
deleted file mode 100644
index 6fe3a4cb1d..0000000000
--- a/environments/updates/update-from-deployed-server-newton.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-resource_registry:
-  OS::TripleO::DeployedServer::ControlPlanePort: ../../deployed-server/ctlplane-port.yaml