Merge lp://qastaging/~tribaal/charms/trusty/rabbitmq-server/resync-charm-helpers into lp://qastaging/charms/trusty/rabbitmq-server
Proposed by
Chris Glass
Status: | Merged |
---|---|
Merged at revision: | 60 |
Proposed branch: | lp://qastaging/~tribaal/charms/trusty/rabbitmq-server/resync-charm-helpers |
Merge into: | lp://qastaging/charms/trusty/rabbitmq-server |
Diff against target: |
3241 lines (+2078/-264) 25 files modified
hooks/charmhelpers/contrib/charmsupport/volumes.py (+5/-2) hooks/charmhelpers/contrib/hahelpers/cluster.py (+59/-17) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+94/-0) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+276/-0) hooks/charmhelpers/contrib/openstack/context.py (+187/-47) hooks/charmhelpers/contrib/openstack/ip.py (+79/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+31/-1) hooks/charmhelpers/contrib/openstack/templating.py (+22/-23) hooks/charmhelpers/contrib/openstack/utils.py (+18/-7) hooks/charmhelpers/contrib/peerstorage/__init__.py (+77/-29) hooks/charmhelpers/contrib/ssl/service.py (+1/-1) hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1) hooks/charmhelpers/contrib/storage/linux/lvm.py (+1/-1) hooks/charmhelpers/contrib/storage/linux/utils.py (+23/-5) hooks/charmhelpers/core/fstab.py (+116/-0) hooks/charmhelpers/core/hookenv.py (+132/-7) hooks/charmhelpers/core/host.py (+100/-12) hooks/charmhelpers/core/services/__init__.py (+2/-0) hooks/charmhelpers/core/services/base.py (+313/-0) hooks/charmhelpers/core/services/helpers.py (+239/-0) hooks/charmhelpers/core/templating.py (+51/-0) hooks/charmhelpers/fetch/__init__.py (+192/-90) hooks/charmhelpers/fetch/archiveurl.py (+49/-4) hooks/charmhelpers/fetch/bzrurl.py (+2/-1) hooks/rabbit_utils.py (+8/-16) |
To merge this branch: | bzr merge lp://qastaging/~tribaal/charms/trusty/rabbitmq-server/resync-charm-helpers |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
David Britton (community) | Approve | ||
Review via email:
|
Description of the change
This branch resyncs charm-helpers to make the charm benefit from in-memeory apt-cache index, so as not to run into race-conditions with other charms.
It also uses the chram-helpers package version comparison instead of its own (again, to prevent grabbing the apt index lock for nothing).
Similar causes and fixes than https:/
To post a comment you must log in.
This looks great! I deployed, it worked fine. (since it was more than just a charm-helpers sync I wanted to check). Thanks, Chris!