From 0d9a47cd7454e0dcd4310ff2998746e61c62d356 Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Thu, 18 Sep 2014 21:41:52 -0400
Subject: [PATCH] parameterize ADMIN_TENANT_NAME
---
docker/keystone/start.sh | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/docker/keystone/start.sh b/docker/keystone/start.sh
index 4dc0ffb7f4..a1425fb089 100755
--- a/docker/keystone/start.sh
+++ b/docker/keystone/start.sh
@@ -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