From cc8104423029d46c3841e8042052a2e7705bc74b Mon Sep 17 00:00:00 2001
From: Whit Morriss <whit.morriss@canonical.com>
Date: Wed, 22 Apr 2015 09:31:19 -0500
Subject: [PATCH] use git copy of docker charms for debugging

---
 cluster/juju/bundles/local.yaml       | 4 ++--
 cluster/juju/charms/trusty/.gitignore | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 cluster/juju/charms/trusty/.gitignore

diff --git a/cluster/juju/bundles/local.yaml b/cluster/juju/bundles/local.yaml
index e17b7e1e816..1ba1b38f23f 100644
--- a/cluster/juju/bundles/local.yaml
+++ b/cluster/juju/bundles/local.yaml
@@ -9,11 +9,11 @@ kubernetes-local:
       options:
         version: "v0.15.0"
     docker:
-      charm: docker-0
+      charm: docker
       branch: https://github.com/chuckbutler/docker-charm.git
       num_units: 2
       options:
-        latest: false
+        latest: true
       annotations:
         "gui-x": "0"
         "gui-y": "0"
diff --git a/cluster/juju/charms/trusty/.gitignore b/cluster/juju/charms/trusty/.gitignore
new file mode 100644
index 00000000000..b3d791e0788
--- /dev/null
+++ b/cluster/juju/charms/trusty/.gitignore
@@ -0,0 +1 @@
+/docker
\ No newline at end of file