From 8eb36e7cde708c36074874401601744caed817c4 Mon Sep 17 00:00:00 2001
From: Daneyon Hansen <danehans@cisco.com>
Date: Fri, 20 Mar 2015 07:18:21 +0000
Subject: [PATCH] Fixes Keystone openrc and sets / for scripts

Previously, the keydtone openrc file was not using the proper
auth url, whcih was broken with too many double ticks. Also
changed the auth port from public to admin since keystone user
is an admin tenant. Changed DIR for scripts to align with the
rest of the project.

Change-Id: Iadde3239227e65ecca479b16a7b7db51d3a579c8
---
 docker/keystone/Dockerfile | 6 +++---
 docker/keystone/start.sh   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker/keystone/Dockerfile b/docker/keystone/Dockerfile
index 3be9ae3cc7..7f1ade48fb 100644
--- a/docker/keystone/Dockerfile
+++ b/docker/keystone/Dockerfile
@@ -7,8 +7,8 @@ RUN yum -y install openstack-keystone \
         ; yum clean all
 
 # Add start-up and check scripts
-ADD ./start.sh /opt/kolla/start.sh
-ADD ./check.sh /opt/kolla/check.sh
+ADD ./start.sh /start.sh
+ADD ./check.sh /check.sh
 
 # Run the Keystone start script
-CMD ["/opt/kolla/start.sh"]
+CMD ["/start.sh"]
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index 829caf6e9e..2f6d902d6b 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -106,8 +106,8 @@ crudini --set $cfg \
 
 # Setup the openrc auth file
 cat > /openrc <<EOF
-export OS_AUTH_URL=http://"${KEYSTONE_PUBLIC_SERVICE_HOST}":"${KEYSTONE_PUBLIC_SERVICE_PORT}/v"${KEYSTONE_API_VERSION}"
-export OS_USERNAME=admin
+export OS_AUTH_URL=http://${KEYSTONE_ADMIN_SERVICE_HOST}:${KEYSTONE_ADMIN_SERVICE_PORT}/v${KEYSTONE_API_VERSION}
+export OS_USERNAME=${KEYSTONE_USER}
 export OS_PASSWORD=${KEYSTONE_ADMIN_PASSWORD}
 export OS_TENANT_NAME=${ADMIN_TENANT_NAME}
 EOF