openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix keystone opt deprecations in manila manifests"

Browse Source
This commit is contained in:
Zuul 2019-02-18 15:35:12 +00:00 committed by Gerrit Code Review
commit 7a8e49784a
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/manila/manila-api-container-puppet.yaml
View File

@ -99,7 +99,7 @@ outputs:
- get_attr: [ManilaBase, role_data, config_settings] - get_attr: [ManilaBase, role_data, config_settings]
- get_attr: [ApacheServiceBase, role_data, config_settings] - get_attr: [ApacheServiceBase, role_data, config_settings]
- manila::keystone::authtoken::password: {get_param: ManilaPassword} - manila::keystone::authtoken::password: {get_param: ManilaPassword}
manila::keystone::authtoken::auth_uri: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] } manila::keystone::authtoken::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
manila::keystone::authtoken::project_name: 'service' manila::keystone::authtoken::project_name: 'service'
manila::keystone::authtoken::user_domain_name: 'Default' manila::keystone::authtoken::user_domain_name: 'Default'

1
deployment/manila/manila-share-container-puppet.yaml
View File

@ -89,7 +89,6 @@ outputs:
- manila::volume::cinder::cinder_admin_tenant_name: 'service' - manila::volume::cinder::cinder_admin_tenant_name: 'service'
manila::keystone::authtoken::password: {get_param: ManilaPassword} manila::keystone::authtoken::password: {get_param: ManilaPassword}
manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} 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::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
manila::keystone::authtoken::project_name: 'service' manila::keystone::authtoken::project_name: 'service'
service_config_settings: service_config_settings: