From f40820391aa3d4558e0aeeb7473dc4f07b95555b Mon Sep 17 00:00:00 2001 From: Charles Butler Date: Thu, 21 May 2015 11:41:41 -0400 Subject: [PATCH 1/2] Repoint flannel-docker service to ~kubernetes namespace This branch of the charm-store charm is tracking features targeted at kubernetes based deployments, while the devel focus will continually be in a state of experimentation and learning. As all things awesome - deploy in lockstep from a source that has extensive testing to ensure we aren't handing out experimental code that hasn't been fully tested e2e w/ the kubernetes project. --- cluster/juju/bundles/local.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cluster/juju/bundles/local.yaml b/cluster/juju/bundles/local.yaml index 8b19f0c3caa..b85dcfca875 100644 --- a/cluster/juju/bundles/local.yaml +++ b/cluster/juju/bundles/local.yaml @@ -10,7 +10,7 @@ kubernetes-local: version: "v0.15.0" docker: charm: docker - branch: https://github.com/chuckbutler/docker-charm.git + branch: cs:trusty/docker num_units: 2 options: latest: true @@ -18,8 +18,7 @@ kubernetes-local: "gui-x": "0" "gui-y": "0" flannel-docker: - charm: flannel-docker - branch: https://github.com/chuckbutler/flannel-docker-charm.git + charm: cs:~kubernetes/trusty/flannel-docker annotations: "gui-x": "0" "gui-y": "300" From 7f38d62b65a5d3c7c77c406bf3229b686c1a8ac4 Mon Sep 17 00:00:00 2001 From: Charles Butler Date: Thu, 21 May 2015 14:46:29 -0400 Subject: [PATCH 2/2] Repeat fix for docker charm (but point @ store copy) --- cluster/juju/bundles/local.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cluster/juju/bundles/local.yaml b/cluster/juju/bundles/local.yaml index b85dcfca875..71022fe9f90 100644 --- a/cluster/juju/bundles/local.yaml +++ b/cluster/juju/bundles/local.yaml @@ -9,8 +9,7 @@ kubernetes-local: options: version: "v0.15.0" docker: - charm: docker - branch: cs:trusty/docker + charm: cs:trusty/docker num_units: 2 options: latest: true