swift-external: deprecate External*Url
ExternalPublicUrl (and the 2 others) are too generic to know that they are for Swift only. Let's rename them and deprecate the old ones. This patch does the following: ExternalPublicUrl, ExternalAdminUrl and ExternalInternalUrl are deprecated. ExternalSwiftPublicUrl, ExternalSwiftAdminUrl and ExternalSwiftInternalUrl should now be used. Change-Id: I4634447762aad20f2c450fe4bb7f0803d13efec2
This commit is contained in:
parent
fa99329115
commit
415d4de088
|
@ -31,12 +31,24 @@ parameters:
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
ExternalPublicUrl:
|
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
|
description: Public endpoint url for the external swift proxy
|
||||||
type: string
|
type: string
|
||||||
ExternalInternalUrl:
|
ExternalSwiftInternalUrl:
|
||||||
description: Internal endpoint url for the external swift proxy
|
description: Internal endpoint url for the external swift proxy
|
||||||
type: string
|
type: string
|
||||||
ExternalAdminUrl:
|
ExternalSwiftAdminUrl:
|
||||||
description: External endpoint url for the external swift proxy
|
description: External endpoint url for the external swift proxy
|
||||||
type: string
|
type: string
|
||||||
ExternalSwiftUserTenant:
|
ExternalSwiftUserTenant:
|
||||||
|
@ -52,8 +64,25 @@ parameters:
|
||||||
default: 'regionOne'
|
default: 'regionOne'
|
||||||
description: Keystone region for endpoint
|
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:
|
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:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
description: Role data for External Swift proxy.
|
description: Role data for External Swift proxy.
|
||||||
|
@ -65,9 +94,21 @@ outputs:
|
||||||
|
|
||||||
service_config_settings:
|
service_config_settings:
|
||||||
keystone:
|
keystone:
|
||||||
swift::keystone::auth::public_url: {get_param: ExternalPublicUrl}
|
swift::keystone::auth::public_url:
|
||||||
swift::keystone::auth::internal_url: {get_param: ExternalInternalUrl}
|
if:
|
||||||
swift::keystone::auth::admin_url: {get_param: ExternalAdminUrl}
|
- deprecated_external_public_url
|
||||||
|
- {get_param: ExternalPublicUrl}
|
||||||
|
- {get_param: ExternalSwiftPublicUrl}
|
||||||
|
swift::keystone::auth::internal_url:
|
||||||
|
if:
|
||||||
|
- deprecated_external_internal_url
|
||||||
|
- {get_param: ExternalInternalUrl}
|
||||||
|
- {get_param: ExternalSwiftInternalUrl}
|
||||||
|
swift::keystone::auth::admin_url:
|
||||||
|
if:
|
||||||
|
- deprecated_external_admin_url
|
||||||
|
- {get_param: ExternalAdminUrl}
|
||||||
|
- {get_param: ExternalSwiftAdminUrl}
|
||||||
swift::keystone::auth::public_url_s3: ''
|
swift::keystone::auth::public_url_s3: ''
|
||||||
swift::keystone::auth::internal_url_s3: ''
|
swift::keystone::auth::internal_url_s3: ''
|
||||||
swift::keystone::auth::admin_url_s3: ''
|
swift::keystone::auth::admin_url_s3: ''
|
||||||
|
|
|
@ -5,8 +5,8 @@ resource_registry:
|
||||||
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
||||||
|
|
||||||
parameter_defaults:
|
parameter_defaults:
|
||||||
ExternalPublicUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
ExternalSwiftPublicUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
||||||
ExternalInternalUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
ExternalSwiftInternalUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
||||||
ExternalAdminUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
ExternalSwiftAdminUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
||||||
ExternalSwiftUserTenant: 'service'
|
ExternalSwiftUserTenant: 'service'
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
---
|
||||||
|
deprecations:
|
||||||
|
- |
|
||||||
|
ExternalPublicUrl, ExternalAdminUrl and ExternalInternalUrl are deprecated.
|
||||||
|
ExternalSwiftPublicUrl, ExternalSwiftAdminUrl and ExternalSwiftInternalUrl
|
||||||
|
should now be used.
|
Loading…
Reference in New Issue