Merge pull request #8624 from chuckbutler/flannel-docker-namespace

Repoint flannel-docker service to ~kubernetes namespace
This commit is contained in:
Dawn Chen 2015-05-22 14:33:58 -07:00
commit c2831fb047

View File

@ -9,8 +9,7 @@ kubernetes-local:
options:
version: "v0.15.0"
docker:
charm: docker
branch: https://github.com/chuckbutler/docker-charm.git
charm: cs:trusty/docker
num_units: 2
options:
latest: true
@ -18,8 +17,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"