From b4766bb3808bafdbcd3b7289219e37d3fe1929ba Mon Sep 17 00:00:00 2001
From: Matt Bruzek <mbruzek@gmail.com>
Date: Wed, 22 Apr 2015 14:45:50 -0500
Subject: [PATCH] Removing unneeded status check before juju deployer

---
 cluster/juju/util.sh | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/cluster/juju/util.sh b/cluster/juju/util.sh
index 2b6c4fd8527..317ce17847e 100755
--- a/cluster/juju/util.sh
+++ b/cluster/juju/util.sh
@@ -40,15 +40,9 @@ function kube-up() {
     else
         juju quickstart --no-browser
     fi
-    # If something were to happen that I'm not accounting for, do not
-    # punish the user by making them tear things down. In a perfect world
-    # quickstart should handle this situation, so be nice in the meantime
-    local envstatus
-    envstatus=$(juju status kubernetes-master --format=oneline)
-
-    if [[ "" == "${envstatus}" ]]; then
-        juju deployer -c ${KUBE_BUNDLE_PATH}
-    fi
+    # The juju-deployer command will deploy the bundle and can be run
+    # multiple times to continue deploying the parts that fail.
+    juju deployer -c ${KUBE_BUNDLE_PATH}
     # Sleep due to juju bug http://pad.lv/1432759
     sleep-status
     detect-master