diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-06 06:34:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-06 06:34:36 +0000 |
| commit | 8431e7412ab8fd7a77befafd0ab687be599ad970 (patch) | |
| tree | 8eea69cc5db30e398e2d814b54163af8114755d8 | |
| parent | f2d0901270b6781a5b8ed37aab47da51b79e907c (diff) | |
| parent | bdccc1cb760ea545dc1c0e12b1088e3b61886929 (diff) | |
Merge "manila: set "neutron_admin_auth_url" correctly" into stable/pike
| -rw-r--r-- | puppet/services/manila-scheduler.yaml | 2 | ||||
| -rw-r--r-- | releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml index 7d43f685..364a1a3d 100644 --- a/puppet/services/manila-scheduler.yaml +++ b/puppet/services/manila-scheduler.yaml @@ -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 diff --git a/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml b/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml new file mode 100644 index 00000000..fa4074b1 --- /dev/null +++ b/releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - The "neutron_admin_auth_url" is now properly set using KeystoneInternal + rather than using the NeutronAdmin endpoint. |