openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Update auth parameters" into stable/queens

This commit is contained in:
Zuul 2019-01-10 16:45:25 +00:00 committed by Gerrit Code Review
parent 50a020cb9e c39b37f6c2
commit dc9e17ce6e
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