openstack/kolla-ansible
Code Issues Proposed changes

Add a "admin" user via crux to keystone container

Browse Source 
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
This commit is contained in:
Steven Dake 2015-03-18 12:46:59 -07:00
parent fedfd8a193
commit 857a2b1dd2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/keystone/start.sh
View File

@ -7,9 +7,11 @@ echo "Running the kolla-common script"
. /opt/kolla/kolla-common.sh . /opt/kolla/kolla-common.sh
# Credentials, token, etc.. # Credentials, token, etc..
: ${ADMIN_USER:=admin}
: ${ADMIN_USER_PASSWORD:=password}
: ${ADMIN_TENANT_NAME:=admin}
: ${KEYSTONE_USER:=keystone} : ${KEYSTONE_USER:=keystone}
: ${KEYSTONE_ADMIN_PASSWORD:=password} : ${KEYSTONE_ADMIN_PASSWORD:=password}
: ${ADMIN_TENANT_NAME:=admin}
: ${KEYSTONE_ADMIN_TOKEN:=changeme} : ${KEYSTONE_ADMIN_TOKEN:=changeme}
# DB Settings # DB Settings
: ${INIT_DB:=true} : ${INIT_DB:=true}
@ -144,6 +146,9 @@ echo "keystone is active @ ${SERVICE_ENDPOINT}"
# Create Keystone tenant, user, role, service and endpoints # Create Keystone tenant, user, role, service and endpoints
echo "Creating 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 \ crux user-create --update \
-n ${KEYSTONE_USER} -p "${KEYSTONE_ADMIN_PASSWORD}" \ -n ${KEYSTONE_USER} -p "${KEYSTONE_ADMIN_PASSWORD}" \
-t ${ADMIN_TENANT_NAME} -r admin -t ${ADMIN_TENANT_NAME} -r admin