Merge pull request #28 from salt-formulas/feature/tunne_bootstrapscrips

Tune bootstrap scripts

galera/files/bootstrap.sh

@@ -2,19 +2,18 @@
 
 service {{ service.service }} start
 
-counter=60
+counter=${1:-60}
 retries=0
 
 while [ $counter -gt 0 ]
 do
-  mysql -u {{ service.admin.user }} -p{{ service.admin.password }} -e"quit"
-  if [[ $? -eq 0 ]]; then
+  if mysql -u {{ service.admin.user }} -p{{ service.admin.password }} -e"quit"; then
     echo "Sucessfully connected to the MySQL service ($retries retries)."
     exit 0
   fi
   counter=$(( counter - 1 ))
   retries=$(( retries + 1 ))
-  sleep 4
+  sleep ${2:-10}
 done
 
 echo "Failed to connect to the MySQL service after $retries retries."

galera/files/init_bootstrap.sh

@@ -2,19 +2,18 @@
 
 service {{ service.service }} start
 
-counter=60
+counter=${1:-60}
 retries=0
 
 while [ $counter -gt 0 ]
 do
-  mysql -u root -e"quit" || mysql -u {{ service.admin.user }} -p{{ service.admin.password }} -e"quit"
-  if [[ $? -eq 0 ]]; then
+  if mysql -u root -e"quit" || mysql -u {{ service.admin.user }} -p{{ service.admin.password }} -e"quit"; then
     echo "Sucessfully connected to the MySQL service ($retries retries)."
     exit 0
   fi
   counter=$(( counter - 1 ))
   retries=$(( retries + 1 ))
-  sleep 2
+  sleep ${2:-10}
 done
 
 echo "Failed to connect to the MySQL service after $retries retries."