Merge "Remove old workaround to upgrade deployed server environment"

deployed-server/ctlplane-port.yaml

@@ -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]}

environments/updates/update-from-deployed-server-newton.yaml

@@ -1,2 +0,0 @@
-resource_registry:
-  OS::TripleO::DeployedServer::ControlPlanePort: ../../deployed-server/ctlplane-port.yaml