Merge lp:~kubernetes/charms/trusty/flannel-docker/trunk into lp:charms/trusty/flannel-docker
Proposed by
Charles Butler
Status: | Merged |
---|---|
Merged at revision: | 12 |
Proposed branch: | lp:~kubernetes/charms/trusty/flannel-docker/trunk |
Merge into: | lp:charms/trusty/flannel-docker |
Diff against target: |
267 lines (+103/-33) 13 files modified
Makefile (+17/-12) README.md (+2/-0) hooks/setup.py (+1/-1) playbooks/flannel-configuration.yaml (+1/-1) playbooks/install-or-upgrade.yaml (+1/-1) playbooks/network-relation-changed.yaml (+5/-1) pytest.ini (+2/-0) scripts/etcd_rest.py (+20/-14) scripts/parse_relation.py (+13/-0) templates/upstart.template (+2/-2) tests/10-deploy.py (+1/-1) tests/tests.yaml (+3/-0) tox.ini (+35/-0) |
To merge this branch: | bzr merge lp:~kubernetes/charms/trusty/flannel-docker/trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matt Bruzek (community) | Approve | ||
Review via email: mp+272232@code.launchpad.net |
Description of the change
Includes a work-around python script to handle ansible raising an error when attempting to parse a non-existant array in the host_vars file.
Prior to this patch, the behavior of the charm was to enter error state if the network relation was not established before relating to etcd. This was problematic and made joining of relations very order-dependent.
This removes that requirement.
To post a comment you must log in.
The tests are successfull: PASS: 5 Total: 5 (778.300656 sec)
I do have one comment, that was not involved in this change. Please change the tests to use the recommended etcd charm rather than the namespaced one.