openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Replace outdated cinder parameters in Manila"

This commit is contained in:
Zuul 2020-04-29 22:40:11 +00:00 committed by Gerrit Code Review
parent 3304e50c45 e929589327
commit 926fd5d7e1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,7 +90,7 @@ outputs:
config_settings:
map_merge:
- get_attr: [ManilaBase, role_data, config_settings]
- manila::volume::cinder::cinder_admin_tenant_name: 'service'
-
# keystone_authtoken
manila::keystone::authtoken::password: {get_param: ManilaPassword}
manila::keystone::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
@ -117,6 +117,15 @@ outputs:
manila::network::neutron::project_domain_name: 'Default'
manila::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
manila::network::neutron::region_name: {get_param: KeystoneRegion}
# volume
manila::volume::cinder::username: 'manila'
manila::volume::cinder::password: {get_param: ManilaPassword}
manila::volume::cinder::auth_type: 'password'
manila::volume::cinder::project_name: 'service'
manila::volume::cinder::user_domain_name: 'Default'
manila::volume::cinder::project_domain_name: 'Default'
manila::volume::cinder::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
manila::volume::cinder::region_name: {get_param: KeystoneRegion}
service_config_settings:
{get_attr: [ManilaBase, role_data, service_config_settings]}
# BEGIN DOCKER SETTINGS