Merge lp:~barryprice/charms/trusty/swift-storage/fstab-loopback-fix into lp:charms/swift-storage

[Barry Price]

The current charm, when using a loopback device for swift storage, results in a line like this in fstab:

/srv/swift.raw /srv/node/loop0 xfs loop, defaults 0 0

The space between "loop," and "defaults" is illegal in fstab, and breaks the charm's parsing of it:

https://pastebin.canonical.com/155757/

[Barry Price (barryprice)]

n.b. we'll want to upstream this against the 16.04 charms, this is just a reference for now.

Unmerged revisions

119. By Barry Price on 2016-05-04

Remove bogus space from fstab loopback mount options

118. By James Page on 2016-04-21

Updates for stable branch creation

Set defaultbranch for git review/gerrit.

Switch amulet tests to stable.

Switch to using stable charm-helpers branch.

Change-Id: I3e1208cc14776eeb84d56ce1dd5da39427608cdb

117. By Liam Young on 2016-04-13

Fix pbr requirement

Change-Id: I9ef7f8b8f70c7ac6175aaed101d876e8b85ae273

116. By James Page on 2016-04-11

Add support for Swift 2.7.0

Resync charm-helpers to pickup changes to add 2.7.0 to
the list of Swift releases for Mitaka.

Change-Id: Ie5d0b1cd80fb3b1b5183f9f371f1bb037596b884

115. By James Page on 2016-04-11

Check apache2 process for keystone/liberty+

Keystone runs under apache2 for liberty+; update amulet
tests to check for apache2 instead of keystone.

Change-Id: I2f1316a78770bc890f81628775dc6d702c254b5b

114. By Edward Hope-Morley on 2016-03-24

Add hardening support

Add charmhelpers.contrib.hardening and calls to install,
config-changed, upgrade-charm and update-status hooks.
Also add new config option to allow one or more hardening
modules to be applied at runtime.

Change-Id: If0d1e10b58ed506e0aca659f30120b8d5c96c04f

113. By James Page on 2016-03-23

Update to charm-tools >= 2.0.0

The new release of charm-tools no longer ships the charm
command; update minimum version requirement and switch
to using charm-proof instead, unblocking current pep8
failures across all charms.

Also pin the version of requests to 2.6.0 until theblues
(indirect dependency of charm-tools) sort out its
requirements versioning.

Change-Id: Idcdfdbbf8e42b2fb2e3f9a4278a7cf1e3c71615b

112. By Jenkins <email address hidden> on 2016-03-21

Merge "Allow devices to be added post-install"

111. By Billy Olsen on 2016-03-16

Use tox in Makefile targets

Modify the Makefile to point at the appropriate tox targets
so that tox and Make output can be equivalent. This involves
mapping the lint target to the pep8 target and the test target
to the py27 target.

Change-Id: I353162534dd0130eaeee54e0195fdd10a8004588

110. By James Page on 2016-03-11

Add support for swift 2.6.0

Swift 2.6.0 has been released; this will form part of the
OpenStack Mitaka release series.

Re-sync charm-helpers to support 2.6.0 release.

Change-Id: If283a3cb0717b85286c5768f2b74ea976563b517

=== modified file 'lib/swift_storage_utils.py'
--- lib/swift_storage_utils.py	2016-03-07 22:25:29 +0000
+++ lib/swift_storage_utils.py	2016-05-04 10:53:23 +0000
@@ -450,7 +450,7 @@
 
         if loopback_device:
             dev = loopback_device
-            options = "loop, defaults"
+            options = "loop,defaults"
 
         mountpoint = '/srv/node/%s' % basename
         filesystem = "xfs"