From 4b4be926f5a48d5a3af7caf86b692efb35271ac3 Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Wed, 3 Sep 2014 15:07:12 -0400
Subject: [PATCH] Improve kube-up to validate salt provisioned

---
 cluster/vagrant/config-default.sh |  3 +-
 cluster/vagrant/util.sh           | 75 +++++++++++++++++++++++++------
 2 files changed, 64 insertions(+), 14 deletions(-)

diff --git a/cluster/vagrant/config-default.sh b/cluster/vagrant/config-default.sh
index 1146e47d41..142a278b83 100755
--- a/cluster/vagrant/config-default.sh
+++ b/cluster/vagrant/config-default.sh
@@ -28,4 +28,5 @@ MINION_IP_BASE="10.245.2."
 for (( i=0; i <${NUM_MINIONS}; i++)) do
 	KUBE_MINION_IP_ADDRESSES[$i]="${MINION_IP_BASE}$[$i+2]"
 	MINION_NAMES[$i]="${MINION_IP_BASE}$[$i+2]"
-done
\ No newline at end of file
+	VAGRANT_MINION_NAMES[$i]="minion-$[$i+1]"
+done
diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index d1de6d4f3b..3524b7b552 100644
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -19,13 +19,13 @@
 source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"}
 
 function detect-master () {
-	echo "KUBE_MASTER_IP: $KUBE_MASTER_IP"
-	echo "KUBE_MASTER: $KUBE_MASTER"
+  echo "KUBE_MASTER_IP: $KUBE_MASTER_IP"
+  echo "KUBE_MASTER: $KUBE_MASTER"
 }
 
 # Get minion IP addresses and store in KUBE_MINION_IP_ADDRESSES[]
 function detect-minions {
-	echo "Minions already detected"
+  echo "Minions already detected"
 }
 
 # Verify prereqs on host machine
@@ -39,39 +39,88 @@ function verify-prereqs {
 }
 
 # Instantiate a kubernetes cluster
-function kube-up {
-	vagrant up
+function kube-up {		
+  get-password
+  vagrant up
+
+  echo "Each machine instance has been created."
+  echo "  Now waiting for the Salt provisioning process to complete on each machine."
+  echo "  This can take some time based on your network, disk, and cpu speed."
+  echo "  It is possible for an error to occur during Salt provision of cluster and this could loop forever."
+
+  # verify master has all required daemons
+  echo "Validating master"
+  MACHINE="master"
+  REQUIRED_DAEMON=("salt-master" "salt-minion" "apiserver" "nginx" "controller-manager" "scheduler")
+  VALIDATED="1"
+  until [ "$VALIDATED" -eq "0" ]; do
+    VALIDATED="0"
+    for daemon in ${REQUIRED_DAEMON[@]}; do
+      vagrant ssh $MACHINE -c "which $daemon" >/dev/null 2>&1 || { printf "."; VALIDATED="1"; sleep 2; }
+    done
+  done
+
+  # verify each minion has all required daemons
+  for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
+    echo "Validating ${VAGRANT_MINION_NAMES[$i]}"
+    MACHINE=${VAGRANT_MINION_NAMES[$i]}
+    REQUIRED_DAEMON=("salt-minion" "kubelet" "docker")
+    VALIDATED="1"
+    until [ "$VALIDATED" -eq "0" ]; do
+      VALIDATED="0"
+      for daemon in ${REQUIRED_DAEMON[@]}; do
+        vagrant ssh $MACHINE -c "which $daemon" >/dev/null 2>&1 || { printf "."; VALIDATED="1"; sleep 2; }
+      done
+    done
+  done
+
+  echo
+  echo "Waiting for each minion to be registered with cloud provider"
+  for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
+    COUNT="0"
+    until [ "$COUNT" -eq "1" ]; do
+      $(dirname $0)/kubecfg.sh -template '{{range.Items}}{{.ID}}:{{end}}' list minions > /tmp/minions
+      COUNT=$(grep -c ${MINION_NAMES[i]} /tmp/minions) || { printf "."; sleep 2; COUNT="0"; }
+    done
+  done
+	
+  echo
+  echo "Kubernetes cluster created."
+  echo
+  echo "Kubernetes cluster is running.  Access the master at:"
+  echo
+  echo "  https://${user}:${passwd}@${KUBE_MASTER_IP}"
 }
 
 # Delete a kubernetes cluster
 function kube-down {
-	vagrant destroy -f
+  vagrant destroy -f
 }
 
 # Update a kubernetes cluster with latest source
 function kube-push {
-	vagrant provision
+  vagrant provision
 }
 
 # Execute prior to running tests to build a release if required for env
 function test-build-release {
-	echo "Vagrant provider can skip release build"
+  echo "Vagrant provider can skip release build"
 }
 
 # Execute prior to running tests to initialize required structure
 function test-setup {
-	echo "Vagrant test setup complete"
+  echo "Vagrant test setup complete"
 }
 
 # Execute after running tests to perform any required clean-up
 function test-teardown {
-	echo "Vagrant ignores tear-down"
+  echo "Vagrant ignores tear-down"
 }
 
 # Set the {user} and {password} environment values required to interact with provider
 function get-password {
-	export user=vagrant
-	export passwd=vagrant
-	echo "Using credentials: $user:$passwd"
+  export user=vagrant
+  export passwd=vagrant
+  echo "Using credentials: $user:$passwd"
 }