19f6f42a5d
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
(cherry picked from commit 415d4de088)
13 lines
555 B
YAML
13 lines
555 B
YAML
resource_registry:
|
|
OS::TripleO::Services::ExternalSwiftProxy: ../deployment/swift/external-swift-proxy-baremetal-puppet.yaml
|
|
OS::TripleO::Services::SwiftProxy: OS::Heat::None
|
|
OS::TripleO::Services::SwiftStorage: OS::Heat::None
|
|
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
|
|
|
|
parameter_defaults:
|
|
ExternalSwiftPublicUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
|
ExternalSwiftInternalUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
|
ExternalSwiftAdminUrl: 'http://swiftproxy:9024/v1/%(tenant_id)s'
|
|
ExternalSwiftUserTenant: 'service'
|
|
|