Merge lp://qastaging/~tribaal/charms/trusty/swift-storage/trunk-fix-1350049 into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Proposed by
Chris Glass
| Status: | Merged |
|---|---|
| Merged at revision: | 28 |
| Proposed branch: | lp://qastaging/~tribaal/charms/trusty/swift-storage/trunk-fix-1350049 |
| Merge into: | lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk |
| Diff against target: |
1611 lines (+968/-90) 21 files modified
Makefile (+8/-2) charm-helpers.yaml (+1/-0) hooks/charmhelpers/contrib/hahelpers/cluster.py (+12/-2) hooks/charmhelpers/contrib/network/ip.py (+156/-0) hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+61/-0) hooks/charmhelpers/contrib/openstack/amulet/utils.py (+275/-0) hooks/charmhelpers/contrib/openstack/context.py (+95/-22) hooks/charmhelpers/contrib/openstack/ip.py (+75/-0) hooks/charmhelpers/contrib/openstack/neutron.py (+14/-0) hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+6/-1) hooks/charmhelpers/contrib/openstack/templating.py (+22/-23) hooks/charmhelpers/contrib/openstack/utils.py (+11/-3) hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1) hooks/charmhelpers/contrib/storage/linux/utils.py (+4/-0) hooks/charmhelpers/core/fstab.py (+116/-0) hooks/charmhelpers/core/hookenv.py (+5/-4) hooks/charmhelpers/core/host.py (+32/-12) hooks/charmhelpers/fetch/__init__.py (+33/-16) hooks/charmhelpers/fetch/bzrurl.py (+2/-1) hooks/swift_storage_utils.py (+11/-3) unit_tests/test_swift_storage_utils.py (+28/-0) |
| To merge this branch: | bzr merge lp://qastaging/~tribaal/charms/trusty/swift-storage/trunk-fix-1350049 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Liam Young (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2014-07-31.
Description of the change
This branch fixes the swift-storage charm's "guess" config option to ignore disks with mounted partitions instead of using a blacklist.
The linked bug has more details about the error condition, but basically sometimes root is not /dev/sda1, and so the blacklist "detection" fails. Testing for mounted partitions is more robust.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Approved