From 93ebd5944b6656280bc84636c55a4ee36dd1ccbf Mon Sep 17 00:00:00 2001
From: Matt Thompson <mattt@defunct.ca>
Date: Tue, 24 Feb 2015 14:32:51 +0000
Subject: [PATCH] Update auth_uri / identity_uri

While testing glance + swift, I noticed that the glance-api.conf and
glance-registry.conf being dropped had incorrect auth_uri /
identity_uri values set.  This change updates auth_uri / identity_uri
throughout to point to the correct keystone_service_adminuri /
keystone_service_internalurl variables.

Change-Id: I3cbbfefe7da54b08bb9a55e4a2ca3a8bd786577d
Closes-Bug: 1425099
---
 templates/nova.conf.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2
index 8be5040e..4faaabd1 100644
--- a/templates/nova.conf.j2
+++ b/templates/nova.conf.j2
@@ -149,8 +149,8 @@ enabled = True
 
 [keystone_authtoken]
 signing_dir = {{ nova_system_home_folder }}/cache/api
-identity_uri = {{ keystone_service_internaluri }}
-auth_uri = {{ keystone_service_internaluri }}
+identity_uri = {{ keystone_service_adminuri }}
+auth_uri = {{ keystone_service_internalurl }}
 admin_tenant_name = {{ nova_service_tenant_name }}
 admin_user = {{ nova_service_user_name }}
 admin_password = {{ nova_service_password }}