openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "manila: set "neutron_admin_auth_url" correctly"

This commit is contained in:
Jenkins 2017-09-01 16:32:38 +00:00 committed by Gerrit Code Review
parent 5046895000 7380183cf5
commit 619e9f8c88
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -70,7 +70,7 @@ outputs:
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, NeutronAdmin, uri]}
manila::network::neutron::neutron_admin_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
manila::network::neutron::neutron_admin_password: {get_param: NeutronPassword}
step_config: |
include ::tripleo::profile::base::manila::scheduler

4
releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml Normal file
View File

@ -0,0 +1,4 @@
---
fixes:
- The "neutron_admin_auth_url" is now properly set using KeystoneInternal
rather than using the NeutronAdmin endpoint.