Juju Charms Collection
swift-storage package

Merge lp://staging/~niedbalski/charms/precise/swift-storage/add-fstab-persist into lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next

Proposed by James Page on 2014-06-02

Status:

Merged

Merged at revision:

Proposed branch:

lp://staging/~niedbalski/charms/precise/swift-storage/add-fstab-persist

Merge into:

lp://staging/~openstack-charmers-archive/charms/trusty/swift-storage/next

Diff against target:

198 lines (+136/-7)

3 files modified

hooks/charmhelpers/core/fstab.py (+114/-0)
hooks/charmhelpers/core/host.py (+20/-6)
hooks/swift_storage_utils.py (+2/-1)

To merge this branch:

bzr merge lp://staging/~niedbalski/charms/precise/swift-storage/add-fstab-persist

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
OpenStack Charmers		2014-06-02	Pending
Review via email: mp+221689@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-05-23.

Description of the change

- Updated charm-helpers with fstab persist support
- Modified mount command for specify "xfs" filesystem type

Revision history for this message

James Page (james-page) wrote on 2014-06-02:

Hi Jorge

This all looks really good - I have it a test and the one comment I have is that its possible to add multiple entries for a single block device to /etc/fstab.

This happened in my testing as I use the ephemeral storage that cloud-init configures mounted on /mnt as storage for swift - linux deals with the double mounting OK - but it looks odd to a user.

Revision history for this message

James Page (james-page) wrote on 2014-06-02:

/dev/vda1 on / type ext4 (rw)
...
/dev/vdb on /mnt type xfs (rw)
/dev/vdb on /srv/node/vdb type xfs (rw)

Revision history for this message

James Page (james-page) wrote on 2014-06-02:

It might be worth checking and removing any existing mounted block device before adding an explicit mapping.

Revision history for this message

Jorge Niedbalski (niedbalski) wrote on 2014-06-02:

Hey james-page,

I tried to reproduce your comment adding the same block-device twice, with no success:

In [8]: Fstab.add('/dev/sdaf', '/mnt/sdaf', 'xfs', None)
Out[8]: <charmhelpers.core.fstab.Entry at 0x17abcd0>

In [9]: Fstab.add('/dev/sdaf', '/mnt/sdaf', 'xfs', None)
Out[9]: False

Does is that initial /dev/vdb on fstab.d/ directory?

lp://staging/~niedbalski/charms/precise/swift-storage/add-fstab-persist updated on 2014-06-04

30. By Jorge Niedbalski on 2014-06-02: Re-imported from ~charm-helpers, added support for UUID,LABEL entries
31. By Jorge Niedbalski on 2014-06-04: Re-imported charm-helpers from latest merged version