Merge lp:~james-page/charm-helpers/fixup-ceph-pool-creation into lp:charm-helpers

[James Page]

Misc fixes for ceph pool creation functions.

=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
--- charmhelpers/contrib/storage/linux/ceph.py	2013-08-23 14:07:52 +0000
+++ charmhelpers/contrib/storage/linux/ceph.py	2013-09-24 14:48:01 +0000
@@ -97,12 +97,13 @@
         return name in out
 
 
-def get_osds():
+def get_osds(service):
     '''
     Return a list of all Ceph Object Storage Daemons
     currently in the cluster
     '''
-    return json.loads(check_output(['ceph', 'osd', 'ls', '--format=json']))
+    return json.loads(check_output(['ceph', '--id', service,
+                                    'osd', 'ls', '--format=json']))
 
 
 def create_pool(service, name, replicas=2):
@@ -113,17 +114,17 @@
         return
     # Calculate the number of placement groups based
     # on upstream recommended best practices.
-    pgnum = (len(get_osds()) * 100 / replicas)
+    pgnum = (len(get_osds(service)) * 100 / replicas)
     cmd = [
         'ceph', '--id', service,
         'osd', 'pool', 'create',
-        name, pgnum
+        name, str(pgnum)
     ]
     check_call(cmd)
     cmd = [
         'ceph', '--id', service,
-        'osd', 'set', name,
-        'size', replicas
+        'osd', 'pool', 'set', name,
+        'size', str(replicas)
     ]
     check_call(cmd)
 
 
=== modified file 'tests/contrib/storage/test_linux_ceph.py'
--- tests/contrib/storage/test_linux_ceph.py	2013-09-23 10:50:53 +0000
+++ tests/contrib/storage/test_linux_ceph.py	2013-09-24 14:48:01 +0000
@@ -92,11 +92,11 @@
 
     def test_get_osds(self):
         self.check_output.return_value = json.dumps([1, 2, 3])
-        self.assertEquals(ceph_utils.get_osds(), [1, 2, 3])
+        self.assertEquals(ceph_utils.get_osds('test'), [1, 2, 3])
 
     def test_get_osds_none(self):
         self.check_output.return_value = json.dumps(None)
-        self.assertEquals(ceph_utils.get_osds(), None)
+        self.assertEquals(ceph_utils.get_osds('test'), None)
 
     @patch.object(ceph_utils, 'get_osds')
     @patch.object(ceph_utils, 'pool_exists')
@@ -107,9 +107,9 @@
         ceph_utils.create_pool(service='cinder', name='foo')
         self.check_call.assert_has_calls([
             call(['ceph', '--id', 'cinder', 'osd', 'pool',
-                  'create', 'foo', 150]),
-            call(['ceph', '--id', 'cinder', 'osd', 'set',
-                  'foo', 'size', 2])
+                  'create', 'foo', '150']),
+            call(['ceph', '--id', 'cinder', 'osd', 'pool', 'set',
+                  'foo', 'size', '2'])
         ])
 
     @patch.object(ceph_utils, 'get_osds')
@@ -121,9 +121,9 @@
         ceph_utils.create_pool(service='cinder', name='foo', replicas=3)
         self.check_call.assert_has_calls([
             call(['ceph', '--id', 'cinder', 'osd', 'pool',
-                  'create', 'foo', 100]),
-            call(['ceph', '--id', 'cinder', 'osd', 'set',
-                  'foo', 'size', 3])
+                  'create', 'foo', '100']),
+            call(['ceph', '--id', 'cinder', 'osd', 'pool', 'set',
+                  'foo', 'size', '3'])
         ])
 
     def test_create_pool_already_exists(self):