Make sure db container waits for etcd to be ready before trying to re…

…gister IP

dockerfiles/mysql/register_ip_and_run.sh

@@ -5,7 +5,7 @@ set -e
 source ./etcd_functions
 
 if [ aa$ETCD_ENABLED == "aayes" ]; then
+    wait_for_etcd_to_get_online
     set_etcd_value "/ezpublish/db_ip" `get_container_ip`
 fi
-
 /run.sh

files/etcd_functions

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+MAXTRY=10
+
 function get_bridge_ip
 {
     ip route| awk '/default/ { print $3 }'
@@ -11,6 +13,25 @@ function get_container_ip
     hostname --all-ip-addresses
 }
 
+function wait_for_etcd_to_get_online
+{
+    local ETCDUP
+    local TRY
+    ETCDUP=false
+    TRY=1
+    while [ $ETCDUP == "false" ]; do
+        echo Contacting etcd, attempt :$TRY
+        etcdctl --peers="http://172.17.42.1:4001" ls / && ETCDUP="true"
+        let TRY=$TRY+1
+        if [ $TRY -gt $MAXTRY ]; then
+            echo Max limit reached. Not able to connect to etcd
+            exit 1;
+        fi
+        sleep 2;
+    done
+
+}
+
 # $1 is key, for instance "/message"
 function get_etcd_value
 {