aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-03-18 12:46:59 -0700
committerSteven Dake <stdake@cisco.com>2015-03-18 12:48:05 -0700
commit857a2b1dd2ac371a6a90d4d2a52506efd9977c6b (patch)
treed298b514b2feb6dcfadf38ef1c74ea641ad01541 /docker
parentfedfd8a193ed952bd30ca334aae2c9a1518a9a07 (diff)
downloadkolla-857a2b1dd2ac371a6a90d4d2a52506efd9977c6b.tar.gz
kolla-857a2b1dd2ac371a6a90d4d2a52506efd9977c6b.zip
Add a "admin" user via crux to keystone container
The keystone container was changed to only add a keystone user. The rest of the infrastructure in Kolla expects the name "admin" from a "can I use a client to access the APIs perspective." As a result, we need a user for keystone and a user for admin which this patch adds. Change-Id: I3a3e938f946df1fd5982e89397ef61368f1f3674
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/keystone/start.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index ab3427256..829caf6e9 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -7,9 +7,11 @@ echo "Running the kolla-common script"
. /opt/kolla/kolla-common.sh
# Credentials, token, etc..
+: ${ADMIN_USER:=admin}
+: ${ADMIN_USER_PASSWORD:=password}
+: ${ADMIN_TENANT_NAME:=admin}
: ${KEYSTONE_USER:=keystone}
: ${KEYSTONE_ADMIN_PASSWORD:=password}
-: ${ADMIN_TENANT_NAME:=admin}
: ${KEYSTONE_ADMIN_TOKEN:=changeme}
# DB Settings
: ${INIT_DB:=true}
@@ -145,6 +147,9 @@ echo "keystone is active @ ${SERVICE_ENDPOINT}"
# Create Keystone tenant, user, role, service and endpoints
echo "Creating Keystone tenant, user, role, service and endpoints"
crux user-create --update \
+ -n ${ADMIN_USER} -p "${ADMIN_USER_PASSWORD}" \
+ -t ${ADMIN_TENANT_NAME} -r admin
+crux user-create --update \
-n ${KEYSTONE_USER} -p "${KEYSTONE_ADMIN_PASSWORD}" \
-t ${ADMIN_TENANT_NAME} -r admin
crux endpoint-create --remove-all \