Merge lp:~hopem/charm-helpers/lp1572506 into lp:charm-helpers

[Edward Hope-Morley]

[Liam Young (gnuoy)]

Approved

review: Approve

=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
--- charmhelpers/contrib/storage/linux/ceph.py	2016-04-15 20:41:19 +0000
+++ charmhelpers/contrib/storage/linux/ceph.py	2016-04-20 10:54:30 +0000
@@ -615,7 +615,7 @@
     except CalledProcessError:
         return False
 
-    return name in out
+    return name in out.split()
 
 
 def get_osds(service):

=== modified file 'tests/contrib/storage/test_linux_ceph.py'
--- tests/contrib/storage/test_linux_ceph.py	2016-04-15 20:41:19 +0000
+++ tests/contrib/storage/test_linux_ceph.py	2016-04-20 10:54:30 +0000
@@ -16,6 +16,7 @@
 import time
 
 LS_POOLS = b"""
+.rgw.foo
 images
 volumes
 rbd
@@ -627,11 +628,13 @@
         """It detects an rbd pool exists"""
         self.check_output.return_value = LS_POOLS
         self.assertTrue(ceph_utils.pool_exists('cinder', 'volumes'))
+        self.assertTrue(ceph_utils.pool_exists('rgw', '.rgw.foo'))
 
     def test_pool_does_not_exist(self):
         """It detects an rbd pool exists"""
         self.check_output.return_value = LS_POOLS
         self.assertFalse(ceph_utils.pool_exists('cinder', 'foo'))
+        self.assertFalse(ceph_utils.pool_exists('rgw', '.rgw'))
 
     def test_pool_exists_error(self):
         """ Ensure subprocess errors and sandboxed with False """