Merge lp:~raharper/charms/precise/swift-storage/ignore-missing-devs-v2 into lp:~openstack-charmers-archive/charms/trusty/swift-storage/next

[James Page]

Allow for the user to specify devices that may not exist (and have swift-storage ignore them like cinder and ceph charms do). With this chance we can use a common swift-storage block-device list that works across multiple different physical hosts where the block devices aren't all the same.

=== modified file 'hooks/misc_utils.py'
--- hooks/misc_utils.py	2013-07-19 19:52:45 +0000
+++ hooks/misc_utils.py	2014-06-18 14:27:07 +0000
@@ -56,7 +56,8 @@
 
     if not is_block_device(bdev):
         log('Failed to locate valid block device at %s' % bdev, level=ERROR)
-        raise
+        # ignore missing block devices
+        return
 
     return bdev
 

=== modified file 'hooks/swift_storage_utils.py'
--- hooks/swift_storage_utils.py	2014-05-23 18:35:14 +0000
+++ hooks/swift_storage_utils.py	2014-06-18 14:27:07 +0000
@@ -164,7 +164,11 @@
     else:
         bdevs = block_device.split(' ')
 
-    return [ensure_block_device(bd) for bd in bdevs]
+    # attempt to ensure block devices, but filter out missing devs
+    _none = ['None', 'none', None]
+    valid_bdevs = [x for x in map(ensure_block_device, bdevs) if x not in _none]
+    log('Valid ensured block devices: %s' % valid_bdevs)
+    return valid_bdevs
 
 
 def mkfs_xfs(bdev):

=== modified file 'unit_tests/test_swift_storage_utils.py'
--- unit_tests/test_swift_storage_utils.py	2014-03-20 13:50:49 +0000
+++ unit_tests/test_swift_storage_utils.py	2014-06-18 14:27:07 +0000
@@ -101,12 +101,17 @@
         self.assertEquals(swift_utils.determine_block_devices(), None)
 
     def _fake_ensure(self, bdev):
-        return bdev.split('|').pop(0)
+        # /dev/vdz is a missing dev
+        if '/dev/vdz' in bdev:
+            return None
+        else:
+            return bdev.split('|').pop(0)
 
     @patch.object(swift_utils, 'ensure_block_device')
     def test_determine_block_device_single_dev(self, _ensure):
         _ensure.side_effect = self._fake_ensure
-        self.test_config.set('block-device', '/dev/vdb')
+        bdevs = '/dev/vdb'
+        self.test_config.set('block-device', bdevs)
         result = swift_utils.determine_block_devices()
         self.assertEquals(['/dev/vdb'], result)
 
@@ -119,6 +124,15 @@
         ex = ['/dev/vdb', '/dev/vdc', '/tmp/swift.img']
         self.assertEquals(ex, result)
 
+    @patch.object(swift_utils, 'ensure_block_device')
+    def test_determine_block_device_with_missing(self, _ensure):
+        _ensure.side_effect = self._fake_ensure
+        bdevs = '/dev/vdb /srv/swift.img|20G /dev/vdz'
+        self.test_config.set('block-device', bdevs)
+        result = swift_utils.determine_block_devices()
+        ex = ['/dev/vdb', '/srv/swift.img']
+        self.assertEqual(ex, result)
+
     @patch.object(swift_utils, 'find_block_devices')
     @patch.object(swift_utils, 'ensure_block_device')
     def test_determine_block_device_guess_dev(self, _ensure, _find):