summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Barron <tpb@dyncloud.net>2017-08-24 15:55:41 -0400
committerEmilien Macchi <emilien@redhat.com>2017-09-05 04:52:43 +0000
commitbdccc1cb760ea545dc1c0e12b1088e3b61886929 (patch)
tree576e419c77d843e2b450e9ffb160a359236d7fc9
parent1fd5d9ea8b1c26a6a1aaea0427915459e55656ef (diff)
manila: set "neutron_admin_auth_url" correctly
It was being set using NeutronAdmin endpoint but it is an authorization url. Set it using KeystoneInternal endpoint. Change-Id: I23f4a895628ac909a1fe1f93cecefa84f25858b1 Closes-Bug: #1712908 (cherry picked from commit 7380183cf590b74f5ad84bb40a8afa08979c235b)
-rw-r--r--puppet/services/manila-scheduler.yaml2
-rw-r--r--releasenotes/notes/fix-neutron_admin_auth_url-c88224251d8eb807.yaml4
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.