From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 13 Feb 2017 18:39:27 +0000 (+0100)
Subject: Changes in installer to retry mysql access in case of wrong user and password
X-Git-Tag: v1.1.0^0
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2Fv1.1;p=osm%2FRO.git

Changes in installer to retry mysql access in case of wrong user and password

Change-Id: I5fafce37fede446c549772b85817552b8e09b2ff
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/scripts/install-openmano.sh b/scripts/install-openmano.sh
index 9e76b0df..76cc4595 100755
--- a/scripts/install-openmano.sh
+++ b/scripts/install-openmano.sh
@@ -237,21 +237,19 @@ fi
 fi  #[[ -z "$NO_PACKAGES" ]]
 
 #check and ask for database user password. Must be done after database installation
-if [[ -n $QUIET_MODE ]]
-then 
-    echo -e "\nCheking database connection and ask for credentials"
-    while ! mysqladmin -s -u$DBUSER $DBPASSWD_PARAM status >/dev/null
-    do
-        [ -n "$logintry" ] &&  echo -e "\nInvalid database credentials!!!. Try again (Ctrl+c to abort)"
-        [ -z "$logintry" ] &&  echo -e "\nProvide database credentials"
-        read -e -p "database user? ($DBUSER) " DBUSER_
-        [ -n "$DBUSER_" ] && DBUSER=$DBUSER_
-        read -e -s -p "database password? (Enter for not using password) " DBPASSWD_
-        [ -n "$DBPASSWD_" ] && DBPASSWD="$DBPASSWD_" && DBPASSWD_PARAM="-p$DBPASSWD_"
-        [ -z "$DBPASSWD_" ] && DBPASSWD=""           && DBPASSWD_PARAM=""
-        logintry="yes"
-    done
-fi
+echo -e "\nChecking database connection and ask for credentials"
+while ! mysqladmin -s -u$DBUSER $DBPASSWD_PARAM status >/dev/null
+do
+    [[ -n $QUIET_MODE ]] && echo -e "\nInvalid database credentials!!! Cannot continue in unattended mode" && exit 1
+    [ -n "$logintry" ] &&  echo -e "\nInvalid database credentials!!! Try again (Ctrl+c to abort)"
+    [ -z "$logintry" ] &&  echo -e "\nProvide database credentials"
+    read -e -p "database user? ($DBUSER) " DBUSER_
+    [ -n "$DBUSER_" ] && DBUSER=$DBUSER_
+    read -e -s -p "database password? (Enter for not using password) " DBPASSWD_
+    [ -n "$DBPASSWD_" ] && DBPASSWD="$DBPASSWD_" && DBPASSWD_PARAM="-p$DBPASSWD_"
+    [ -z "$DBPASSWD_" ] && DBPASSWD=""           && DBPASSWD_PARAM=""
+    logintry="yes"
+done
 
 if [[ -z "$NO_PACKAGES" ]]
 then