From b9ac078be7fb1751612106a9970a9a388b2e7107 Mon Sep 17 00:00:00 2001
From: Matt Bruzek <matthew.bruzek@canonical.com>
Date: Thu, 4 Aug 2016 12:04:16 -0500
Subject: [PATCH] Updating the util.sh script to work with latest version of
 juju.

---
 cluster/juju/bundles/{local.yaml => local.yaml.base} | 6 +++---
 cluster/juju/layers/kubernetes/metadata.yaml         | 2 +-
 cluster/juju/util.sh                                 | 9 ++++++---
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename cluster/juju/bundles/{local.yaml => local.yaml.base} (73%)

diff --git a/cluster/juju/bundles/local.yaml b/cluster/juju/bundles/local.yaml.base
similarity index 73%
rename from cluster/juju/bundles/local.yaml
rename to cluster/juju/bundles/local.yaml.base
index 907022b1e6c..dc01cf16b90 100644
--- a/cluster/juju/bundles/local.yaml
+++ b/cluster/juju/bundles/local.yaml.base
@@ -1,13 +1,13 @@
 services:
   kubernetes:
-    charm: local:trusty/kubernetes
+    charm: __CHARM_DIR__/builds/kubernetes
     annotations:
       "gui-x": "600"
       "gui-y": "0"
     expose: true
     num_units: 2
   etcd:
-    charm: cs:~containers/trusty/etcd
+    charm: cs:~containers/etcd
     annotations:
       "gui-x": "300"
       "gui-y": "0"
@@ -15,4 +15,4 @@ services:
 relations:
   - - "kubernetes:etcd"
     - "etcd:db"
-series: trusty
+series: xenial
diff --git a/cluster/juju/layers/kubernetes/metadata.yaml b/cluster/juju/layers/kubernetes/metadata.yaml
index e9980d1a2d8..4b135da119d 100644
--- a/cluster/juju/layers/kubernetes/metadata.yaml
+++ b/cluster/juju/layers/kubernetes/metadata.yaml
@@ -16,4 +16,4 @@ requires:
    etcd:
      interface: etcd
 series: 
-  - 'trusty'
+  - xenial
diff --git a/cluster/juju/util.sh b/cluster/juju/util.sh
index 0e707d4258b..c0b5d6feed4 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})
@@ -38,7 +38,7 @@ function build-local() {
     # This used to build the kubernetes project. Now it rebuilds the charm(s)
     # living in `cluster/juju/layers`
 
-    charm build -o $JUJU_REPOSITORY -s trusty ${JUJU_PATH}/layers/kubernetes
+    charm build ${JUJU_PATH}/layers/kubernetes -o $JUJU_REPOSITORY -r --no-local-layers
 }
 
 function detect-master() {
@@ -69,6 +69,9 @@ function detect-nodes() {
 function kube-up() {
     build-local
 
+    # Replace the charm directory in the bundle.
+    sed "s|__CHARM_DIR__|${JUJU_REPOSITORY}|" < ${KUBE_BUNDLE_PATH}.base > ${KUBE_BUNDLE_PATH}
+
     # The juju-deployer command will deploy the bundle and can be run
     # multiple times to continue deploying the parts that fail.
     juju deploy ${KUBE_BUNDLE_PATH}
@@ -117,7 +120,7 @@ function sleep-status() {
 
     while [[ $i < $maxtime && -z $jujustatus ]]; do
       sleep 15
-      i+=15
+      i=$((i + 15))
       jujustatus=$(${JUJU_PATH}/identify-leaders.py)
       export KUBE_MASTER_NAME=${jujustatus}
     done