From 3c080f9e62ffc6c75c64ba0d86167fbeb2d83a35 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Mon, 6 Oct 2014 20:54:44 -0400
Subject: renamed keystone services

This renames the keystone services so that they are named by function,
rather than port number (which would be confusing if they were running
on a different port).

Change-Id: Ibb0263a133c28a104563df431870a9effe584012
---
 docker/glance/glance-base/config-glance.sh | 2 +-
 docker/glance/glance-registry/start.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'docker/glance')

diff --git a/docker/glance/glance-base/config-glance.sh b/docker/glance/glance-base/config-glance.sh
index 6cdd76efd..494d49704 100644
--- a/docker/glance/glance-base/config-glance.sh
+++ b/docker/glance/glance-base/config-glance.sh
@@ -33,7 +33,7 @@ done
 crudini --set $cfg
         keystone_authtoken \
         auth_uri \
-        "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_5000_PORT_5000_TCP_ADDR}:5000/"
+        "${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_PUBLIC_PORT_5000_TCP_ADDR}:5000/"
 crudini --set $cfg
         keystone_authtoken \
         admin_tenant_name \
diff --git a/docker/glance/glance-registry/start.sh b/docker/glance/glance-registry/start.sh
index c169087a9..2356620d9 100755
--- a/docker/glance/glance-registry/start.sh
+++ b/docker/glance/glance-registry/start.sh
@@ -33,7 +33,7 @@ EOF
 /usr/bin/glance-manage db_sync
 
 export SERVICE_TOKEN="${KEYSTONE_ADMIN_TOKEN}"
-export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONEMASTER_35357_PORT_35357_TCP_ADDR}:35357/v2.0"
+export SERVICE_ENDPOINT="${KEYSTONE_AUTH_PROTOCOL}://${KEYSTONE_ADMIN_PORT_35357_TCP_ADDR}:35357/v2.0"
 
 /usr/bin/keystone user-create --name ${GLANCE_KEYSTONE_USER} --pass ${GLANCE_KEYSTONE_PASS}
 /usr/bin/keystone user-role-add --user ${GLANCE_KEYSTONE_USER} --role admin --tenant ${GLANCE_TENANT_NAME}
-- 
cgit v1.2.3