From 42bf766c78fd802ee38cd9515ee09e38f78f8779 Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 22 Jan 2021 18:04:11 +0100
Subject: [PATCH] Remove External{Internal,Public,Admin}Url parameters

These were deprecated in stable/train and we don't want the deprecated
params to have precedence over the newer parameter names anymore.

Change-Id: Ic29810ae8e8d53d54a423e494b4446963f7c381c
---
 ...external-swift-proxy-baremetal-puppet.yaml | 49 ++-----------------
 1 file changed, 3 insertions(+), 46 deletions(-)

diff --git a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml
index 1e92990252..67fd4c80d0 100644
--- a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml
+++ b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml
@@ -30,18 +30,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  ExternalPublicUrl:
-    description: (DEPRECATED) Public endpoint url for the external swift proxy
-    type: string
-    default: 'deprecated'
-  ExternalInternalUrl:
-    description: (DEPRECATED) Internal endpoint url for the external swift proxy
-    type: string
-    default: 'deprecated'
-  ExternalAdminUrl:
-    description: (DEPRECATED) External endpoint url for the external swift proxy
-    type: string
-    default: 'deprecated'
   ExternalSwiftPublicUrl:
     description: Public endpoint url for the external swift proxy
     type: string
@@ -64,25 +52,6 @@ parameters:
     default: 'regionOne'
     description: Keystone region for endpoint
 
-parameter_groups:
-- label: deprecated
-  description: |
-   The following parameters are deprecated and will be removed. They should not
-   be relied on for new deployments. If you have concerns regarding deprecated
-   parameters, please contact the TripleO development team on IRC or the
-   OpenStack mailing list.
-  parameters:
-  - ExternalAdminUrl
-  - ExternalInternalUrl
-  - ExternalPublicUrl
-
-resources:
-
-conditions:
-  deprecated_external_admin_url: {not: {equals: [{get_param: ExternalAdminUrl}, 'deprecated']}}
-  deprecated_external_internal_url: {not: {equals: [{get_param: ExternalInternalUrl}, 'deprecated']}}
-  deprecated_external_public_url: {not: {equals: [{get_param: ExternalPublicUrl}, 'deprecated']}}
-
 outputs:
   role_data:
     description: Role data for External Swift proxy.
@@ -95,21 +64,9 @@ outputs:
       keystone_resources:
         swift:
           endpoints:
-            public:
-              if:
-              - deprecated_external_public_url
-              - {get_param: ExternalPublicUrl}
-              - {get_param: ExternalSwiftPublicUrl}
-            internal:
-              if:
-              - deprecated_external_internal_url
-              - {get_param: ExternalInternalUrl}
-              - {get_param: ExternalSwiftInternalUrl}
-            admin:
-              if:
-              - deprecated_external_admin_url
-              - {get_param: ExternalAdminUrl}
-              - {get_param: ExternalSwiftAdminUrl}
+            public: {get_param: ExternalSwiftPublicUrl}
+            internal: {get_param: ExternalSwiftInternalUrl}
+            admin: {get_param: ExternalSwiftAdminUrl}
           users:
             swift:
               password: {get_param: SwiftPassword}