Merge lp://qastaging/~james-page/charms/trusty/swift-storage/fstab-persist into lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk

Proposed by James Page
Status: Merged
Merged at revision: 30
Proposed branch: lp://qastaging/~james-page/charms/trusty/swift-storage/fstab-persist
Merge into: lp://qastaging/~openstack-charmers-archive/charms/trusty/swift-storage/trunk
Diff against target: 1215 lines (+84/-705)
15 files modified
charm-helpers.yaml (+1/-1)
hooks/charmhelpers/contrib/hahelpers/cluster.py (+2/-12)
hooks/charmhelpers/contrib/network/ip.py (+10/-97)
hooks/charmhelpers/contrib/openstack/amulet/deployment.py (+0/-61)
hooks/charmhelpers/contrib/openstack/amulet/utils.py (+0/-275)
hooks/charmhelpers/contrib/openstack/context.py (+16/-84)
hooks/charmhelpers/contrib/openstack/ip.py (+0/-75)
hooks/charmhelpers/contrib/openstack/neutron.py (+0/-14)
hooks/charmhelpers/contrib/openstack/templates/haproxy.cfg (+1/-6)
hooks/charmhelpers/contrib/openstack/templating.py (+23/-22)
hooks/charmhelpers/contrib/openstack/utils.py (+3/-11)
hooks/charmhelpers/contrib/storage/linux/ceph.py (+1/-1)
hooks/charmhelpers/core/hookenv.py (+4/-5)
hooks/charmhelpers/core/host.py (+6/-8)
hooks/charmhelpers/fetch/__init__.py (+17/-33)
To merge this branch: bzr merge lp://qastaging/~james-page/charms/trusty/swift-storage/fstab-persist
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Chuck Short (community) Needs Information
Review via email: mp+222855@code.qastaging.launchpad.net

Description of the change

Stable update for fstab persistence

To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

So what happens if the charm fails, and leaves a corrupted /etc/fstab?

review: Needs Information
Revision history for this message
James Page (james-page) wrote :

The hook will error out, indicating that the user need to investigate and take manual action to resolve.

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Worked for me. Deployed, saw it taking over /dev/sdb. /etc/fstab was updated and the partition was mounted again after a reboot.

Revision history for this message
James Page (james-page) wrote :

Slightly wider context for charm-helpers sync as stable branch had managed to pickup a sync of charm-helpers trunk.

Revision history for this message
Liam Young (gnuoy) wrote :

Apologies for the charm-helpers trunk sync. If you could rerun the sync in your mp I'll merge it. As your mp stands it backs out a fix Landscape need for Bug 1350049 and 1350051

review: Needs Fixing
31. By James Page

Resync stable helpers

Revision history for this message
Liam Young (gnuoy) wrote :

Approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches