Merge lp:~james-page/charm-helpers/folsom-ceph-support into lp:charm-helpers

[James Page]

Add support for older versions of ceph.

Argonaut does not support ceph osd ls; detect and default to a sane
pgnum size (200) if this version is detected.

This can be manually changed in ceph afterwards if need be

=== modified file 'charmhelpers/contrib/storage/linux/ceph.py'
--- charmhelpers/contrib/storage/linux/ceph.py	2013-10-20 16:29:28 +0000
+++ charmhelpers/contrib/storage/linux/ceph.py	2013-10-24 18:02:04 +0000
@@ -102,8 +102,12 @@
     Return a list of all Ceph Object Storage Daemons
     currently in the cluster
     '''
-    return json.loads(check_output(['ceph', '--id', service,
-                                    'osd', 'ls', '--format=json']))
+    version = ceph_version()
+    if version and version >= '0.56':
+        return json.loads(check_output(['ceph', '--id', service,
+                                        'osd', 'ls', '--format=json']))
+    else:
+        return None
 
 
 def create_pool(service, name, replicas=2):
@@ -114,7 +118,13 @@
         return
     # Calculate the number of placement groups based
     # on upstream recommended best practices.
-    pgnum = (len(get_osds(service)) * 100 / replicas)
+    osds = get_osds(service)
+    if osds:
+        pgnum = (len(osds) * 100 / replicas)
+    else:
+        # NOTE(james-page): Default to 200 for older ceph versions
+        # which don't support OSD query from cli
+        pgnum = 200
     cmd = [
         'ceph', '--id', service,
         'osd', 'pool', 'create',
@@ -357,3 +367,17 @@
     if user and group:
         check_call(['chown', '%s.%s' % (user, group), keyring])
     return True
+
+
+def ceph_version():
+    ''' Retrieve the local version of ceph '''
+    if os.path.exists('/usr/bin/ceph'):
+        cmd = ['ceph', '-v']
+        output = check_output(cmd)
+        output = output.split()
+        if len(output) > 3:
+            return output[2]
+        else:
+            return None
+    else:
+        return None

=== modified file 'tests/contrib/storage/test_linux_ceph.py'
--- tests/contrib/storage/test_linux_ceph.py	2013-10-20 16:29:28 +0000
+++ tests/contrib/storage/test_linux_ceph.py	2013-10-24 18:02:04 +0000
@@ -90,11 +90,20 @@
         _mkdir.assert_called_with('/etc/ceph')
         _install.assert_called_with('ceph-common', fatal=True)
 
-    def test_get_osds(self):
+    @patch.object(ceph_utils, 'ceph_version')
+    def test_get_osds(self, version):
+        version.return_value = '0.56.2'
         self.check_output.return_value = json.dumps([1, 2, 3])
         self.assertEquals(ceph_utils.get_osds('test'), [1, 2, 3])
 
-    def test_get_osds_none(self):
+    @patch.object(ceph_utils, 'ceph_version')
+    def test_get_osds_argonaut(self, version):
+        version.return_value = '0.48.3'
+        self.assertEquals(ceph_utils.get_osds('test'), None)
+
+    @patch.object(ceph_utils, 'ceph_version')
+    def test_get_osds_none(self, version):
+        version.return_value = '0.56.2'
         self.check_output.return_value = json.dumps(None)
         self.assertEquals(ceph_utils.get_osds('test'), None)
 
@@ -126,6 +135,20 @@
                   'foo', 'size', '3'])
         ])
 
+    @patch.object(ceph_utils, 'get_osds')
+    @patch.object(ceph_utils, 'pool_exists')
+    def test_create_pool_argonaut(self, _exists, _get_osds):
+        '''It creates rados pool correctly with 3 replicas'''
+        _exists.return_value = False
+        _get_osds.return_value = None
+        ceph_utils.create_pool(service='cinder', name='foo')
+        self.check_call.assert_has_calls([
+            call(['ceph', '--id', 'cinder', 'osd', 'pool',
+                  'create', 'foo', '200']),
+            call(['ceph', '--id', 'cinder', 'osd', 'pool', 'set',
+                  'foo', 'size', '2'])
+        ])
+
     def test_create_pool_already_exists(self):
         self._patch('pool_exists')
         self.pool_exists.return_value = True
@@ -500,3 +523,23 @@
             'adam.users',
             '/etc/ceph/client.foo.keyring'
         ])
+
+    @patch('os.path.exists')
+    def test_ceph_version_not_installed(self, path):
+        path.return_value = False
+        self.assertEquals(ceph_utils.ceph_version(), None)
+
+    @patch.object(ceph_utils, 'check_output')
+    @patch('os.path.exists')
+    def test_ceph_version_error(self, path, output):
+        path.return_value = True
+        output.return_value = ''
+        self.assertEquals(ceph_utils.ceph_version(), None)
+
+    @patch.object(ceph_utils, 'check_output')
+    @patch('os.path.exists')
+    def test_ceph_version_ok(self, path, output):
+        path.return_value = True
+        output.return_value = 'ceph version 0.67.4'\
+            ' (ad85b8bfafea6232d64cb7ba76a8b6e8252fa0c7)'
+        self.assertEquals(ceph_utils.ceph_version(), '0.67.4')