Merge lp:~lazypower/charms/trusty/docker/trunk into lp:charms/trusty/docker
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 7 | ||||
Proposed branch: | lp:~lazypower/charms/trusty/docker/trunk | ||||
Merge into: | lp:charms/trusty/docker | ||||
Diff against target: |
401 lines (+115/-58) 13 files modified
Makefile (+4/-1) README.md (+27/-9) config.yaml (+10/-2) hooks/python-pkgs.txt (+1/-1) hooks/setup.py (+0/-22) hooks/setup.sh (+0/-9) metadata.yaml (+2/-2) playbooks/config-changed.yaml (+40/-0) playbooks/latest-docker.yaml (+9/-4) playbooks/network-relation-changed.yaml (+2/-0) playbooks/site.yaml (+2/-2) tests/10-deploy-test (+18/-5) tests/tests.yaml (+0/-1) |
||||
To merge this branch: | bzr merge lp:~lazypower/charms/trusty/docker/trunk | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Matt Bruzek (community) | Approve | ||
charmers | Pending | ||
Review via email: mp+265205@code.launchpad.net |
Description of the change
Updates to v0.1.6 of the docker charm, which adds AUFS backend storage support.
The existing charm deploys device mapper, leaving this enabled by default is not desireable as Docker Inc has depreciated support for this storage engine. Its possible to upgrade existing clusters, however the upgrade path takes some manual intervention of exporting and re-importing the containers.
This has potential side-effects for data-containers, and existing services which will prevent them from starting. Full export and recovery instructions are included in the README along with validation of AUFS storage driver from a devicemapper upgrade have been included in the test suite.
Hey Chuck,
Thanks for this update to the docker charm. As we discussed over IRC this branch does not merge cleanly with the trusty/docker that is in the store.
Please fix the branch and resubmit. Thank you.