retry weave (#1462)

* retry weave

* separate connection errors from install errors, and add a timeout

* add version

* infra version

openstack-tenant/packages/mobiledgex/Makefile

@@ -1,5 +1,5 @@
 PACKAGE = mobiledgex
-VERSION = 4.3.2
+VERSION = 4.3.5
 DISTRIBUTION = cirrus
 COMPONENT = main
 

openstack-tenant/packages/mobiledgex/install-k8s-master.sh

@@ -67,7 +67,30 @@ done
 #    exit 1
 #fi
 # the pod network plugin has to be done for coredns to come up
+
+
+echo Checking Weave CNI download URL is available
+TIMEOUT=$((SECONDS+300))
+nc cloud.weave.works 443 -v -z -w 5 
+while [ $? -ne 0 ] ; do
+    # retry until timeout
+    if [ $SECONDS -gt $TIMEOUT ] ; then
+        echo Timed out waiting for Weave CNI
+        exit 1
+    fi
+    echo Waiting to check Weave URL available - now $SECONDS timeout $TIMEOUT
+    sleep 5
+    nc cloud.weave.works 443 -v -z -w 5
+done
+
+echo Weave URL is reachable, install CNI
+
 kubectl apply -f "https://cloud.weave.works/k8s/net?k8s-version=$(kubectl version | base64 | tr -d '\n')"
+if [ $? -ne 0 ] ; then
+    echo Failed to install Weave
+    exit 1
+fi
+
 kubectl get pods --all-namespaces
 kubectl get nodes | grep NotReady
 while [ $? -eq 0 ] ; do

vmlayer/props.go

@@ -34,7 +34,7 @@ type VMProperties struct {
 var ImageFormatQcow2 = "qcow2"
 var ImageFormatVmdk = "vmdk"
 
-var MEXInfraVersion = "4.3.2"
+var MEXInfraVersion = "4.3.5"
 var ImageNamePrefix = "mobiledgex-v"
 var DefaultOSImageName = ImageNamePrefix + MEXInfraVersion