2b662be9a4
auth_uri option has been depreacted in favor of www_authenticate_uri from group keystone_authtoken in puppet-keystone [0] and keystonemiddleware [1]. This patch adds the new option keeping auth_uri references in the templates until the replace will be updated in all puppet packages. [0] https://review.openstack.org/#/c/558344/ [1] https://review.openstack.org/#/c/508522/ Closes-Bug: #1761171 Change-Id: I804ec73b970844d245dbb0911710ec817359beb0
71 lines
2.4 KiB
YAML
71 lines
2.4 KiB
YAML
heat_template_version: queens
|
|
|
|
description: >
|
|
Manila-share service 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
|
|
DefaultPasswords:
|
|
default: {}
|
|
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
|
|
MonitoringSubscriptionManilaShare:
|
|
default: 'overcloud-manila-share'
|
|
type: string
|
|
ManilaPassword:
|
|
description: The password for the manila service account.
|
|
type: string
|
|
hidden: true
|
|
|
|
resources:
|
|
ManilaBase:
|
|
type: ./manila-base.yaml
|
|
properties:
|
|
ServiceData: {get_param: ServiceData}
|
|
ServiceNetMap: {get_param: ServiceNetMap}
|
|
DefaultPasswords: {get_param: DefaultPasswords}
|
|
EndpointMap: {get_param: EndpointMap}
|
|
RoleName: {get_param: RoleName}
|
|
RoleParameters: {get_param: RoleParameters}
|
|
|
|
outputs:
|
|
role_data:
|
|
description: Role data for the Manila-share role.
|
|
value:
|
|
service_name: manila_share
|
|
monitoring_subscription: {get_param: MonitoringSubscriptionManilaShare}
|
|
config_settings:
|
|
map_merge:
|
|
- get_attr: [ManilaBase, role_data, config_settings]
|
|
- manila::volume::cinder::cinder_admin_tenant_name: 'service'
|
|
manila::keystone::authtoken::password: {get_param: ManilaPassword}
|
|
manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
|
manila::keystone::authtoken::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
|
|
manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
|
|
manila::keystone::authtoken::project_name: 'service'
|
|
service_config_settings:
|
|
get_attr: [ManilaBase, role_data, service_config_settings]
|
|
step_config: |
|
|
include ::tripleo::profile::base::manila::share
|