openstack/kolla-ansible
Code Issues Proposed changes

parameterize ADMIN_TENANT_NAME

Browse Source
This commit is contained in:
Lars Kellogg-Stedman 2014-09-18 21:41:52 -04:00
parent 25cfe70226
commit 0d9a47cd74
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/keystone/start.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash
: ${KEYSTONE_ADMIN_PASSWORD:=redhat}
: ${ADMIN_TENANT_NAME:=admin}
if ! [ "$KEYSTONE_ADMIN_TOKEN" ]; then
KEYSTONE_ADMIN_TOKEN=$(openssl rand -hex 15)
@ -20,11 +21,16 @@ crudini --set /etc/keystone/keystone.conf \
database \
connection \
"mysql://keystone:${KEYSTONE_DB_PASSWORD}@${MARIADBMASTER_PORT_3306_TCP_ADDR}:${MARIADBMASTER_PORT_3306_TCP_PORT}/keystone"
crudini --set /etc/keystone/keystone.conf \
DEFAULT \
admin_token \
"${KEYSTONE_ADMIN_TOKEN}"
crudini --del /etc/keystone/keystone.conf \
DEFAULT \
log_file
crudini --del /etc/keystone/keystone.conf \
DEFAULT \
log_dir
/usr/bin/keystone-manage db_sync
@ -38,8 +44,8 @@ export SERVICE_ENDPOINT="http://127.0.0.1:35357/v2.0"
/bin/keystone user-create --name admin --pass ${KEYSTONE_ADMIN_PASSWORD}
/bin/keystone role-create --name admin
/bin/keystone tenant-create --name admin
/bin/keystone user-role-add --user admin --role admin --tenant admin
/bin/keystone tenant-create --name ${ADMIN_TENANT_NAME}
/bin/keystone user-role-add --user admin --role admin --tenant ${ADMIN_TENANT_NAME}
kill -TERM $PID