From f7c030b047e3f34f33c9d423ef9d9de83720e4fe Mon Sep 17 00:00:00 2001
From: "Munoz, Obed N" <obed.n.munoz@intel.com>
Date: Wed, 24 Aug 2016 10:58:41 -0500
Subject: [PATCH] Remove complexity

Signed-off-by: Munoz, Obed N <obed.n.munoz@intel.com>
---
 keystone/README.md    | 13 ++-----------
 keystone/bootstrap.sh | 18 +++++++++---------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/keystone/README.md b/keystone/README.md
index cb0157f..43c8a91 100644
--- a/keystone/README.md
+++ b/keystone/README.md
@@ -31,9 +31,6 @@ Start Keystone container
     YOUR_HOST=`hostname -f`
     docker run -d -it --name keystone -p 5000:5000 -p 35357:35357 \
 		   -e IDENTITY_HOST="$YOUR_HOST" \
-		   -e KEYSTONE_DB_USER="keystone" \
-		   -e KEYSTONE_DB_PASSWORD="secret" \
-		   -e KEYSTONE_DB_NAME="keystone" \
 		   -e KEYSTONE_ADMIN_PASSWORD="secret" \
 		   -v `pwd`/keystone_cert.pem:/etc/nginx/ssl/keystone_cert.pem \
 		   -v `pwd`/keystone_key.pem:/etc/nginx/ssl/keystone_key.pem \
@@ -58,14 +55,8 @@ Environment Variables
 ---------------------
 - ``IDENTITY_HOST``
   Identity (Keystone) host
-- ``KEYSTONE_DB_USER``
-  Keystone database username
-- ``KEYSTONE_DB_PASSWORD``
-  Keystone database password
-- ``KEYSTONE_DB_NAME``
-  Keystone database name
-- ``KEYSTONE_ADMIN_PASSWORD``
-  Keystone Admin user password
+- (Optional) ``KEYSTONE_ADMIN_PASSWORD``
+  Keystone Admin user password. Default: ``bb915e9ce0ae4b46e82a069b2ef0f8d7``
 
 Extra Build ARGs
 ----------------
diff --git a/keystone/bootstrap.sh b/keystone/bootstrap.sh
index f230512..2c9ff6d 100755
--- a/keystone/bootstrap.sh
+++ b/keystone/bootstrap.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
-IDENTITY_HOST=$IDENTITY_HOST
-KEYSTONE_DB_USER=$KEYSTONE_DB_USER
-KEYSTONE_DB_PASSWORD=$KEYSTONE_DB_PASSWORD
-KEYSTONE_DB_NAME=$KEYSTONE_DB_NAME
-KEYSTONE_ADMIN_PASSWORD=$KEYSTONE_ADMIN_PASSWORD
+IDENTITY_HOST=localhost
+KEYSTONE_DB_USER=keystone
+KEYSTONE_DB_PASSWORD=914de29bc82616d7c159eaf9b1f39402
+KEYSTONE_DB_NAME=keystone
+KEYSTONE_ADMIN_PASSWORD="${KEYSTONE_ADMIN_PASSWORD:-bb915e9ce0ae4b46e82a069b2ef0f8d7}"
 
 sed -i.bak s/IDENTITY_HOST/$IDENTITY_HOST/g /root/openrc
 sed -i.bak s/KEYSTONE_ADMIN_PASSWORD/$KEYSTONE_ADMIN_PASSWORD/g /root/openrc
@@ -31,9 +31,9 @@ if [[ ! -d /var/lib/mysql/mysql ]]; then
     mysql -e "DROP DATABASE test;"
 
     # Keystone Database and user
-    mysql -e "create database keystone;"
-    mysql -e "grant all on keystone.* to 'keystone'@'%' identified by 'secret';"
-    mysql -e "grant all on keystone.* to 'keystone'@'localhost' identified by 'secret';"
+    mysql -e "create database $KEYSTONE_DB_NAME;"
+    mysql -e "grant all on $KEYSTONE_DB_NAME.* to '$KEYSTONE_DB_USER'@'%' identified by '$KEYSTONE_DB_PASSWORD';"
+    mysql -e "grant all on $KEYSTONE_DB_NAME.* to '$KEYSTONE_DB_USER'@'localhost' identified by '$KEYSTONE_DB_PASSWORD';"
 fi
 
 # Populate keystone database
@@ -56,7 +56,7 @@ echo "user  root;" >> /usr/share/nginx/conf/nginx.conf
 
 # Bootstrap keystone
 keystone-manage bootstrap --bootstrap-username admin \
-		--bootstrap-password secret \
+		--bootstrap-password $KEYSTONE_ADMIN_PASSWORD \
 		--bootstrap-project-name admin \
 		--bootstrap-role-name admin \
 		--bootstrap-service-name keystone \