Fix bug 1600 - checking for db user keystone creation

[osm/devops.git] / docker / Keystone / scripts / start.sh

diff --git a/docker/Keystone/scripts/start.sh b/docker/Keystone/scripts/start.sh
index 0e7af80..66b3830 100755 (executable)
--- a/docker/Keystone/scripts/start.sh
+++ b/docker/Keystone/scripts/start.sh
@@ -19,6 +19,7 @@
 ##
 
 DB_EXISTS=""
+USER_DB_EXISTS=""
 DB_NOT_EMPTY=""
 
 max_attempts=120
@@ -75,14 +76,31 @@ function is_db_created() {
     fi
 }
 
+function is_user_db_created() {
+    db_host=$1
+    db_port=$2
+    db_user=$3
+    db_pswd=$4
+    db_user_to_check=$5
+
+    user_count=$(mysql -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" --default_character_set utf8 -sse "SELECT COUNT(*) FROM mysql.user WHERE user='$db_user_to_check' AND host='%';")
+
+    if [ $user_count -gt 0 ]; then
+        echo "DB User $db_name exists"
+        return 0
+    else
+        echo "DB User$db_name does not exist"
+        return 1
+    fi
+}
+
 wait_db "$DB_HOST" "$DB_PORT" || exit 1
 
 is_db_created "$DB_HOST" "$DB_PORT" "$ROOT_DB_USER" "$ROOT_DB_PASSWORD" "keystone" && DB_EXISTS="Y"
+is_user_db_created "$DB_HOST" "$DB_PORT" "$ROOT_DB_USER" "$ROOT_DB_PASSWORD" "keystone" && USER_DB_EXISTS="Y"
 
 if [ -z $DB_EXISTS ]; then
     mysql -h"$DB_HOST" -P"$DB_PORT" -u"$ROOT_DB_USER" -p"$ROOT_DB_PASSWORD" --default_character_set utf8 -e "CREATE DATABASE keystone"
-    mysql -h"$DB_HOST" -P"$DB_PORT" -u"$ROOT_DB_USER" -p"$ROOT_DB_PASSWORD" --default_character_set utf8 -e "GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY '$KEYSTONE_DB_PASSWORD'"
-    mysql -h"$DB_HOST" -P"$DB_PORT" -u"$ROOT_DB_USER" -p"$ROOT_DB_PASSWORD" --default_character_set utf8 -e "GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '$KEYSTONE_DB_PASSWORD'"
 else
     if [ $(mysql -h"$DB_HOST" -P"$DB_PORT" -u"$ROOT_DB_USER" -p"$ROOT_DB_PASSWORD" --default_character_set utf8 -sse "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = 'keystone';") -gt 0 ]; then
         echo "DB keystone is empty"
@@ -90,6 +108,11 @@ else
     fi
 fi
 
+if [ -z $USER_DB_EXISTS ]; then
+    mysql -h"$DB_HOST" -P"$DB_PORT" -u"$ROOT_DB_USER" -p"$ROOT_DB_PASSWORD" --default_character_set utf8 -e "GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'localhost' IDENTIFIED BY '$KEYSTONE_DB_PASSWORD'"
+    mysql -h"$DB_HOST" -P"$DB_PORT" -u"$ROOT_DB_USER" -p"$ROOT_DB_PASSWORD" --default_character_set utf8 -e "GRANT ALL PRIVILEGES ON keystone.* TO 'keystone'@'%' IDENTIFIED BY '$KEYSTONE_DB_PASSWORD'"
+fi
+
 # Setting Keystone database connection
 sed -i '/^\[database\]$/,/^\[/ s/^connection = .*/connection = mysql+pymysql:\/\/keystone:'$KEYSTONE_DB_PASSWORD'@'$DB_HOST':'$DB_PORT'\/keystone/' /etc/keystone/keystone.conf
 
@@ -117,62 +140,68 @@ group_allow_update=false
 group_allow_delete=false
 query_scope = sub
 EOF
-    if [ $LDAP_BIND_USER ]; then
+    if [ "$LDAP_BIND_USER" ]; then
         echo "user = $LDAP_BIND_USER" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_BIND_PASSWORD ]; then
+    if [ "$LDAP_BIND_PASSWORD" ]; then
         echo "password = $LDAP_BIND_PASSWORD" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_CHASE_REFERRALS ]; then
+    if [ "$LDAP_CHASE_REFERRALS" ]; then
         echo "chase_referrals = $LDAP_CHASE_REFERRALS" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_PAGE_SIZE ]; then
+    if [ "$LDAP_PAGE_SIZE" ]; then
         echo "page_size = $LDAP_PAGE_SIZE" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_TREE_DN ]; then
+    if [ "$LDAP_USER_TREE_DN" ]; then
         echo "user_tree_dn = $LDAP_USER_TREE_DN" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_OBJECTCLASS ]; then
+    if [ "$LDAP_USER_OBJECTCLASS" ]; then
         echo "user_objectclass = $LDAP_USER_OBJECTCLASS" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_ID_ATTRIBUTE ]; then
+    if [ "$LDAP_USER_ID_ATTRIBUTE" ]; then
         echo "user_id_attribute = $LDAP_USER_ID_ATTRIBUTE" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_NAME_ATTRIBUTE ]; then
+    if [ "$LDAP_USER_NAME_ATTRIBUTE" ]; then
         echo "user_name_attribute = $LDAP_USER_NAME_ATTRIBUTE" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_PASS_ATTRIBUTE ]; then
+    if [ "$LDAP_USER_PASS_ATTRIBUTE" ]; then
         echo "user_pass_attribute = $LDAP_USER_PASS_ATTRIBUTE" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_FILTER ]; then
+    if [ "$LDAP_USER_FILTER" ]; then
         echo "user_filter = $LDAP_USER_FILTER" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_ENABLED_ATTRIBUTE ]; then
+    if [ "$LDAP_USER_ENABLED_ATTRIBUTE" ]; then
         echo "user_enabled_attribute = $LDAP_USER_ENABLED_ATTRIBUTE" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_ENABLED_MASK ]; then
+    if [ "$LDAP_USER_ENABLED_MASK" ]; then
         echo "user_enabled_mask = $LDAP_USER_ENABLED_MASK" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_ENABLED_DEFAULT ]; then
+    if [ "$LDAP_USER_ENABLED_DEFAULT" ]; then
         echo "user_enabled_default = $LDAP_USER_ENABLED_DEFAULT" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USER_ENABLED_INVERT ]; then
+    if [ "$LDAP_USER_ENABLED_INVERT" ]; then
         echo "user_enabled_invert = $LDAP_USER_ENABLED_INVERT" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_GROUP_OBJECTCLASS ]; then
+    if [ "$LDAP_GROUP_OBJECTCLASS" ]; then
         echo "group_objectclass = $LDAP_GROUP_OBJECTCLASS" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_GROUP_TREE_DN ]; then
+    if [ "$LDAP_GROUP_TREE_DN" ]; then
         echo "group_tree_dn = $LDAP_GROUP_TREE_DN" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
-    if [ $LDAP_USE_STARTTLS ] && [ "$LDAP_USE_STARTTLS" == "true" ]; then
+    if [ "$LDAP_TLS_CACERT_BASE64" ]; then
+        mkdir -p /etc/ssl/certs/
+        echo "-----BEGIN CERTIFICATE-----" >> /etc/ssl/certs/ca-certificates.crt
+        echo $LDAP_TLS_CACERT_BASE64 >> /etc/ssl/certs/ca-certificates.crt
+        echo "-----END CERTIFICATE-----" >> /etc/ssl/certs/ca-certificates.crt
+    fi
+    if [ "$LDAP_USE_STARTTLS" ] && [ "$LDAP_USE_STARTTLS" == "true" ]; then
         echo "use_tls = true" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
         mkdir -p /etc/keystone/ssl/certs/
         echo "-----BEGIN CERTIFICATE-----" > /etc/keystone/ssl/certs/ca.pem
         echo $LDAP_TLS_CACERT_BASE64 >> /etc/keystone/ssl/certs/ca.pem
         echo "-----END CERTIFICATE-----" >> /etc/keystone/ssl/certs/ca.pem
         echo "tls_cacertfile = /etc/keystone/ssl/certs/ca.pem" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
-        if [ $LDAP_TLS_REQ_CERT ]; then
+        if [ "$LDAP_TLS_REQ_CERT" ]; then
             echo "tls_req_cert = $LDAP_TLS_REQ_CERT" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
         fi
     fi