Merge lp:~niedbalski/charms/trusty/swift-storage/backport-fix-lp1510666 into lp:~openstack-charmers-archive/charms/trusty/swift-storage/trunk

[Jorge Niedbalski]

Backport of fix for LP: #1510666

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #13926 swift-storage for niedbalski mp277738
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/13926/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #12982 swift-storage for niedbalski mp277738
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/12982/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7909 swift-storage for niedbalski mp277738
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7909/

[Billy Olsen (billy-olsen)]

LGTM, Approved.

review: Approve

=== modified file 'charmhelpers/contrib/storage/linux/loopback.py'
--- charmhelpers/contrib/storage/linux/loopback.py	2015-10-22 13:25:25 +0000
+++ charmhelpers/contrib/storage/linux/loopback.py	2015-11-17 17:31:05 +0000
@@ -76,3 +76,13 @@
         check_call(cmd)
 
     return create_loopback(path)
+
+
+def is_mapped_loopback_device(device):
+    """
+    Checks if a given device name is an existing/mapped loopback device.
+    :param device: str: Full path to the device (eg, /dev/loop1).
+    :returns: str: Path to the backing file if is a loopback device
+    empty string otherwise
+    """
+    return loopback_devices().get(device, "")
 
=== modified file 'lib/swift_storage_utils.py'
--- lib/swift_storage_utils.py	2015-10-22 13:25:25 +0000
+++ lib/swift_storage_utils.py	2015-11-17 17:31:05 +0000
@@ -27,6 +27,7 @@
 from charmhelpers.core.host import (
     mkdir,
     mount,
+    fstab_add,
     service_restart,
     lsb_release
 )
@@ -45,6 +46,10 @@
     is_device_mounted,
 )
 
+from charmhelpers.contrib.storage.linux.loopback import (
+    is_mapped_loopback_device,
+)
+
 from charmhelpers.contrib.openstack.utils import (
     configure_installation_source,
     get_os_codename_install_source,
@@ -253,8 +258,20 @@
         _dev = os.path.basename(dev)
         _mp = os.path.join('/srv', 'node', _dev)
         mkdir(_mp, owner='swift', group='swift')
-        mount(dev, '/srv/node/%s' % _dev, persist=True,
-              filesystem="xfs")
+
+        options = None
+        loopback_device = is_mapped_loopback_device(dev)
+
+        if loopback_device:
+            dev = loopback_device
+            options = "loop, defaults"
+
+        mountpoint = '/srv/node/%s' % _dev
+        filesystem = "xfs"
+
+        mount(dev, mountpoint, filesystem=filesystem)
+        fstab_add(dev, mountpoint, filesystem, options=options)
+
     check_call(['chown', '-R', 'swift:swift', '/srv/node/'])
     check_call(['chmod', '-R', '0755', '/srv/node/'])
 
 
=== modified file 'unit_tests/test_swift_storage_utils.py'
--- unit_tests/test_swift_storage_utils.py	2015-10-22 13:25:25 +0000
+++ unit_tests/test_swift_storage_utils.py	2015-11-17 17:31:05 +0000
@@ -28,6 +28,9 @@
     '_save_script_rc',
     'lsb_release',
     'is_paused',
+    'fstab_add',
+    'mount',
+    'is_mapped_loopback_device',
 ]
 
 
@@ -218,6 +221,7 @@
     @patch.object(swift_utils, 'mkfs_xfs')
     @patch.object(swift_utils, 'determine_block_devices')
     def test_setup_storage_overwrite(self, determine, mkfs, clean):
+        self.is_mapped_loopback_device.return_value = None
         determine.return_value = ['/dev/vdb']
         self.test_config.set('overwrite', 'True')
         swift_utils.setup_storage()
@@ -225,7 +229,10 @@
         self.mkdir.assert_called_with('/srv/node/vdb', owner='swift',
                                       group='swift')
         self.mount.assert_called_with('/dev/vdb', '/srv/node/vdb',
-                                      filesystem='xfs', persist=True)
+                                      filesystem='xfs')
+        self.fstab_add.assert_called_with('/dev/vdb', '/srv/node/vdb',
+                                          'xfs',
+                                          options=None)
         calls = [call(['chown', '-R', 'swift:swift', '/srv/node/']),
                  call(['chmod', '-R', '0755', '/srv/node/'])]
         self.check_call.assert_has_calls(calls)
@@ -338,3 +345,21 @@
                     swift_utils.OBJECT_SVCS)
         for service in services:
             self.assertIn(call(service), self.service_restart.call_args_list)
+
+    @patch.object(swift_utils, "mkfs_xfs")
+    @patch.object(swift_utils, "determine_block_devices")
+    def test_setup_storage_img(self, determine, mkfs):
+        determine.return_value = ["/srv/test.img", ]
+        self.is_mapped_loopback_device.return_value = "/srv/test.img"
+        swift_utils.setup_storage()
+        self.mount.assert_called_with(
+            "/srv/test.img",
+            "/srv/node/test.img",
+            filesystem="xfs",
+        )
+        self.fstab_add.assert_called_with(
+            '/srv/test.img',
+            '/srv/node/test.img',
+            'xfs',
+            options='loop, defaults'
+        )