d17f4dfc93
The ExternalSwiftUserTenant parameter is supposed to determin the
keystone project to which the swift user belong, however in fact
the parameter is not honored.
This patch ensures that the parmaeter value is used as a project name
when TripleO creates keystone resources.
Change-Id: Ib7a173643880b573c3f30b3d990c7c617231a14c
Closes-Bug: #1901652
(cherry picked from commit e618ad8d34)
77 lines
2.2 KiB
YAML
77 lines
2.2 KiB
YAML
heat_template_version: wallaby
|
|
|
|
description: >
|
|
External Swift Proxy endpoint configured with Puppet
|
|
|
|
parameters:
|
|
ServiceData:
|
|
default: {}
|
|
description: Dictionary packing service data
|
|
type: json
|
|
ServiceNetMap:
|
|
default: {}
|
|
description: Mapping of service_name -> network name. Typically set
|
|
via parameter_defaults in the resource registry. This
|
|
mapping overrides those in ServiceNetMapDefaults.
|
|
type: json
|
|
RoleName:
|
|
default: ''
|
|
description: Role name on which the service is applied
|
|
type: string
|
|
RoleParameters:
|
|
default: {}
|
|
description: Parameters specific to the role
|
|
type: json
|
|
EndpointMap:
|
|
default: {}
|
|
description: Mapping of service endpoint -> protocol. Typically set
|
|
via parameter_defaults in the resource registry.
|
|
type: json
|
|
ExternalSwiftPublicUrl:
|
|
description: Public endpoint url for the external swift proxy
|
|
type: string
|
|
ExternalSwiftInternalUrl:
|
|
description: Internal endpoint url for the external swift proxy
|
|
type: string
|
|
ExternalSwiftAdminUrl:
|
|
description: External endpoint url for the external swift proxy
|
|
type: string
|
|
ExternalSwiftUserTenant:
|
|
description: Tenant where swift user will be set as admin
|
|
type: string
|
|
default: 'service'
|
|
SwiftPassword:
|
|
description: The password for the swift service account
|
|
type: string
|
|
hidden: true
|
|
KeystoneRegion:
|
|
type: string
|
|
default: 'regionOne'
|
|
description: Keystone region for endpoint
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for External Swift proxy.
|
|
value:
|
|
service_name: external_swift_proxy
|
|
config_settings:
|
|
|
|
step_config:
|
|
|
|
keystone_resources:
|
|
swift:
|
|
endpoints:
|
|
public: {get_param: ExternalSwiftPublicUrl}
|
|
internal: {get_param: ExternalSwiftInternalUrl}
|
|
admin: {get_param: ExternalSwiftAdminUrl}
|
|
users:
|
|
swift:
|
|
password: {get_param: SwiftPassword}
|
|
project: {get_param: ExternalSwiftUserTenant}
|
|
project: {get_param: ExternalSwiftUserTenant}
|
|
region: {get_param: KeystoneRegion}
|
|
service: 'object-store'
|
|
roles:
|
|
- swiftoperator
|
|
- ResellerAdmin
|