X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=docker%2FKeystone%2Fscripts%2Fstart.sh;h=1e3709e461fd9045c8a04da120eec65b907cc335;hb=refs%2Fchanges%2F46%2F6646%2F2;hp=4d95c60997c7a4ccbf39986726c8a44c697eef31;hpb=afa54c7dbc0904c09ec20b41b9b603fe4cb7263d;p=osm%2Fdevops.git

diff --git a/docker/Keystone/scripts/start.sh b/docker/Keystone/scripts/start.sh
index 4d95c609..1e3709e4 100755
--- a/docker/Keystone/scripts/start.sh
+++ b/docker/Keystone/scripts/start.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+DB_EXISTS=""
+
 max_attempts=120
 function wait_db(){
     db_host=$1
@@ -27,8 +29,7 @@ function is_db_created() {
     db_pswd=$4
     db_name=$5
 
-    RESULT=`mysqlshow -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" | grep -v Wildcard | grep -o $db_name`
-    if [ "$RESULT" == "$db_name" ]; then
+    if mysqlshow -h"$db_host" -P"$db_port" -u"$db_user" -p"$db_pswd" | grep -v Wildcard | grep -q $db_name; then
         echo "DB $db_name exists"
         return 0
     else
@@ -94,9 +95,11 @@ if [ -z $DB_EXISTS ]; then
     openstack role add --project service --user nbi admin
 fi
 
-while [ $(ps -ef | grep -v grep | grep apache2 | wc -l) -ne 0 ]
+while ps -ef | grep -v grep | grep -q apache2
 do
     sleep 60
 done
 
+# Only reaches this point if apache2 stops running
+# When this happens exits with error code
 exit 1