From 1d3b52fd9fcb33ff91e0376d4b75aa2babcdcb7b Mon Sep 17 00:00:00 2001
From: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Thu, 4 Aug 2016 14:05:28 -0500
Subject: [PATCH] Fixing identification script and adding output to ignore.

---
 .gitignore                       |  1 +
 cluster/juju/identify-leaders.py | 14 ++++++++------
 cluster/juju/util.sh             |  6 +++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9431f8a1885..03e8221e49d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,7 @@ network_closure.sh
 
 # Juju Stuff
 /cluster/juju/charms/*
+/cluster/juju/bundles/local.yaml
 
 # Downloaded Kubernetes binary release
 /kubernetes/
diff --git a/cluster/juju/identify-leaders.py b/cluster/juju/identify-leaders.py
index 0dd9eff1af1..dd0e80e339f 100755
--- a/cluster/juju/identify-leaders.py
+++ b/cluster/juju/identify-leaders.py
@@ -17,13 +17,15 @@
 from subprocess import check_output
 import yaml
 
-out = check_output(['juju', 'status', 'kubernetes', '--format=yaml'])
+
+cmd = ['juju', 'run', '--application', 'kubernetes', '--format=yaml', 'is-leader']
+out = check_output(cmd)
 try:
     parsed_output = yaml.safe_load(out)
-    model = parsed_output['services']['kubernetes']['units']
-    for unit in model:
-        if 'workload-status' in model[unit].keys():
-            if 'leader' in model[unit]['workload-status']['message']:
-                print(unit)
+    for unit in parsed_output:
+        standard_out = unit['Stdout'].rstrip()
+        unit_id = unit['UnitId']
+        if 'True' in standard_out:
+            print(unit_id)
 except:
     pass
diff --git a/cluster/juju/util.sh b/cluster/juju/util.sh
index c0b5d6feed4..8715b4418c9 100755
--- a/cluster/juju/util.sh
+++ b/cluster/juju/util.sh
@@ -18,7 +18,7 @@
 set -o errexit
 set -o nounset
 set -o pipefail
-set -o xtrace
+#set -o xtrace
 
 UTIL_SCRIPT=$(readlink -m "${BASH_SOURCE}")
 JUJU_PATH=$(dirname ${UTIL_SCRIPT})
@@ -54,7 +54,7 @@ function detect-master() {
 function detect-nodes() {
     # Run the Juju command that gets the minion private IP addresses.
     local ipoutput
-    ipoutput=$(juju run --service kubernetes "unit-get private-address" --format=json)
+    ipoutput=$(juju run --application kubernetes "unit-get private-address" --format=json)
     # [
     # {"MachineId":"2","Stdout":"192.168.122.188\n","UnitId":"kubernetes/0"},
     # {"MachineId":"3","Stdout":"192.168.122.166\n","UnitId":"kubernetes/1"}
@@ -91,7 +91,7 @@ function kube-up() {
       tar xfz ${KUBECTL_DIR}/kubectl_package.tar.gz -C ${KUBECTL_DIR}
     )
     # Export the location of the kubectl configuration file.
-    export KUBECONFIG="${KUBECTL_DIR}/config"
+    export KUBECONFIG="${KUBECTL_DIR}/kubeconfig"
 }
 
 function kube-down() {