From eda93fea238e07c083e5425a54b43dc7829bf9d8 Mon Sep 17 00:00:00 2001
From: Bjoern Teipel <bjoern.teipel@rackspace.com>
Date: Wed, 2 Mar 2016 13:54:19 -0600
Subject: [PATCH] Fix auth_url for neutron configuration

This fix configures the auth_url parameter to use keystone_service_adminurl
over the existing keystone_service_adminuri parameter which actually leads
to a incomplete URL lacking the API version like /v3/tokens

Change-Id: Ic8b353b6d41b48cb9d7d825d26dc932d940994e8
Closes-Bug: #1552394
---
 templates/metadata_agent.ini.j2 | 2 +-
 templates/neutron.conf.j2       | 2 +-
 templates/plugins/plumgrid/pgrc | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/metadata_agent.ini.j2 b/templates/metadata_agent.ini.j2
index ca8c9cfd..0f581a57 100644
--- a/templates/metadata_agent.ini.j2
+++ b/templates/metadata_agent.ini.j2
@@ -10,7 +10,7 @@ debug = {{ debug }}
 
 # Neutron credentials for API access
 auth_plugin = {{ neutron_keystone_auth_plugin }}
-auth_url = {{ keystone_service_adminuri }}
+auth_url = {{ keystone_service_adminurl }}
 auth_uri = {{ keystone_service_internaluri }}
 auth_region = {{ keystone_service_region }}
 project_domain_id = {{ neutron_service_project_domain_id }}
diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index 44912f63..1ee2c176 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -95,7 +95,7 @@ rpc_response_timeout = {{ neutron_rpc_response_timeout }}
 
 [nova]
 auth_plugin = {{ nova_keystone_auth_plugin }}
-auth_url = {{ keystone_service_adminuri }}
+auth_url = {{ keystone_service_adminurl }}
 region_name = {{ nova_service_region }}
 project_domain_id = {{ nova_service_project_domain_id }}
 user_domain_id = {{ nova_service_user_domain_id }}
diff --git a/templates/plugins/plumgrid/pgrc b/templates/plugins/plumgrid/pgrc
index 3c679265..0b8e1ff2 100644
--- a/templates/plugins/plumgrid/pgrc
+++ b/templates/plugins/plumgrid/pgrc
@@ -1,6 +1,6 @@
 #!/bin/sh
 # {{ ansible_managed }}
-export os_auth_url="{{ keystone_service_adminuri }}/v3"
+export os_auth_url="{{ keystone_service_adminurl }}"
 export os_admin_user="{{ keystone_admin_user_name }}"
 export os_admin_tenant="{{ keystone_admin_tenant_name }}"
 export os_admin_password="{{ keystone_auth_admin_password }}"