diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-03-18 20:19:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-03-18 20:19:16 +0000 |
| commit | 904c8db96e6816032ad262611dd096d06627f6fa (patch) | |
| tree | d7f0d77c0b405e04417afb476062c8c6454918fc | |
| parent | 47826c56dd58b0f45e83371a5321279d14eb23c4 (diff) | |
| parent | 857a2b1dd2ac371a6a90d4d2a52506efd9977c6b (diff) | |
| download | kolla-904c8db96e6816032ad262611dd096d06627f6fa.tar.gz kolla-904c8db96e6816032ad262611dd096d06627f6fa.zip | |
Merge "Add a "admin" user via crux to keystone container"
| -rwxr-xr-x | docker/keystone/start.sh | 7 |
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 \ |