Merge lp:~lazypower/charms/trusty/flannel-docker/trunk into lp:charms/trusty/flannel-docker
Proposed by
Charles Butler
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 11 | ||||||||
Proposed branch: | lp:~lazypower/charms/trusty/flannel-docker/trunk | ||||||||
Merge into: | lp:charms/trusty/flannel-docker | ||||||||
Diff against target: |
28 lines (+3/-7) 1 file modified
playbooks/network-relation-changed.yaml (+3/-7) |
||||||||
To merge this branch: | bzr merge lp:~lazypower/charms/trusty/flannel-docker/trunk | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matt Bruzek (community) | Approve | ||
Review via email: mp+259786@code.launchpad.net |
Description of the change
Older revisions of the charm had edgecase breakage when working with multiple clusters.
The flannel charm now supports working with 2 docker clusters, such as the following
juju deploy cs:~kubernetes/
juju deploy trusty/docker cluster1
juju add-unit -n 5 cluster1
juju deploy trusty/docker cluster2
juju add-unit -n 5 cluster2
juju deploy flannel-docker
juju add-relation flannel-
juju add-relation flannel-
juju add-relation flannel-docker:db etcd:client
juju add-relation flannel-
juju add-relation flannel-
To post a comment you must log in.
Greetings Charles!
Thanks for the latest fixes to the flannel-docker charm! The ansible code
change looks safe and logical. I ran this latest
code on our CI system and saw it pass on Azure, HP, and Joyent. I also
deployed the scenario that you listed in the description which worked fine.
I merged your changes with the exising flannel-docker charm. Thank you for
this quality submission!