openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Update auth parameters 

Some parameters have been deprecated in puppet-manila
Whereas we are picking up deprecated parameters, it's good
that we fix this already here as well.

Change-Id: I29df069bd90eacdd01c9c600cfaebce22fe15731
Depends-On: I745a170ac4458a3f13efc255fc37540a11b54274
Partial-Bug: #1802393
This commit is contained in:
Victoria Martinez de la Cruz 2018-12-21 19:15:53 -03:00
parent 81f408a14d
commit cd86676615
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
puppet/services/manila-scheduler.yaml
View File

@ -66,11 +66,10 @@ outputs:
config_settings:
map_merge:
- get_attr: [ManilaBase, role_data, config_settings]
- manila::compute::nova::nova_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
manila::compute::nova::nova_admin_password: {get_param: NovaPassword}
manila::compute::nova::nova_admin_tenant_name: 'service'
manila::network::neutron::neutron_url: {get_param: [EndpointMap, NeutronInternal, uri]}
manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
- manila::compute::nova::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
manila::compute::nova::password: {get_param: NovaPassword}
manila::compute::nova::project_name: 'service'
manila::network::neutron::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
manila::network::neutron::password: {get_param: NeutronPassword}
step_config: |
include ::tripleo::profile::base::manila::scheduler