Merge lp:~hopem/charms/precise/cinder/python-redux.lp1226823 into lp:~openstack-charmers/charms/precise/cinder/python-redux

[Edward Hope-Morley]

[Edward Hope-Morley (hopem)]

Adam, I have not been able to run the unit tests as they won't run for me on precise->raring. Thought I would push this for you to look and if possible test while i get saucy up to try to run tests again.

[lp:~hopem/charms/precise/cinder/python-redux.lp1226823]

69. By Edward Hope-Morley on 2013-09-24

Fixed unit tests

[Edward Hope-Morley (hopem)]

Ok I've run the test and they work fine aside from a tests that appears to be broken in trunk i.e.:

make test
Starting tests...
nose.plugins.cover: ERROR: Coverage not available: unable to import coverage module
............................................F.
======================================================================
FAIL: Ensure API restart before haproxy on cluster changed
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/mock.py", line 1201, in patched
    return func(*args, **keywargs)
  File "/home/ubuntu/cinder.redux.lp1226823/unit_tests/test_cluster_hooks.py", line 81, in test_cluster_hook
    self.assertEquals(ex, service.call_args_list)
AssertionError: [call('restart', 'cinder-api'), call('restart', 'cinder-volume'), call('restart', 'cinder-scheduler'), call('restart', 'haproxy'), call('restart', 'apache2')] != []

----------------------------------------------------------------------
Ran 46 tests in 0.909s

FAILED (failures=1)
make: *** [test] Error 1

[Adam Gandelman (gandelman-a)]

Dont worry about that test, it is unrelated. Some mocks bleeding between test files, I need to fix that. LG, though. Merged.

=== modified file 'config.yaml'
--- config.yaml	2013-06-13 00:55:02 +0000
+++ config.yaml	2013-09-24 16:42:36 +0000
@@ -28,6 +28,16 @@
             The *available* block device on which to create LVM volume group.
             May also be set to None for deployments that will not need local
             storage (eg, Ceph/RBD-backed volumes).
+    ceph-osd-replication-count:
+        default: 2
+        type: int
+        description: |
+            This value dictates the number of replicas ceph must make of any
+            object it stores withing the cinder rbd pool. Of course, this only
+            applies if using Ceph as a backend store. Note that once the cinder
+            rbd pool has been created, changing this value will not have any
+            effect (although it can be changed in ceph by manually configuring
+            your ceph cluster).
     volume-group:
         default: cinder-volumes
         type: string

=== modified file 'hooks/cinder_hooks.py'
--- hooks/cinder_hooks.py	2013-09-24 15:54:19 +0000
+++ hooks/cinder_hooks.py	2013-09-24 16:42:36 +0000
@@ -172,7 +172,9 @@
     set_ceph_env_variables(service=svc)
 
     if eligible_leader(CLUSTER_RES):
-        ensure_ceph_pool(service=svc)
+        _config = config()
+        ensure_ceph_pool(service=svc,
+                         replicas=_config['ceph-osd-replication-count'])
 
 
 @hooks.hook('cluster-relation-changed',

=== modified file 'hooks/cinder_utils.py'
--- hooks/cinder_utils.py	2013-09-23 18:43:55 +0000
+++ hooks/cinder_utils.py	2013-09-24 16:42:36 +0000
@@ -301,11 +301,11 @@
     subprocess.check_call(cmd)
 
 
-def ensure_ceph_pool(service):
+def ensure_ceph_pool(service, replicas):
     '''Creates a ceph pool for service if one does not exist'''
     # TODO: Ditto about moving somewhere sharable.
     if not ceph_pool_exists(service=service, name=service):
-        ceph_create_pool(service=service, name=service)
+        ceph_create_pool(service=service, name=service, replicas=replicas)
 
 
 def set_ceph_env_variables(service):

=== modified file 'revision'
--- revision	2013-07-19 23:03:02 +0000
+++ revision	2013-09-24 16:42:36 +0000
@@ -1,1 +1,1 @@
-128
+129

=== modified file 'unit_tests/test_cinder_hooks.py'
--- unit_tests/test_cinder_hooks.py	2013-09-23 18:10:11 +0000
+++ unit_tests/test_cinder_hooks.py	2013-09-24 16:42:36 +0000
@@ -265,7 +265,7 @@
         self.ensure_ceph_keyring.return_value = True
         hooks.hooks.execute(['hooks/ceph-relation-changed'])
         self.ensure_ceph_keyring.assert_called_with(service='cinder')
-        self.ensure_ceph_pool.assert_called_with(service='cinder')
+        self.ensure_ceph_pool.assert_called_with(service='cinder', replicas=2)
         for c in [call('/etc/ceph/ceph.conf'),
                   call('/etc/cinder/cinder.conf')]:
             self.assertIn(c, self.CONFIGS.write.call_args_list)

=== modified file 'unit_tests/test_cinder_utils.py'
--- unit_tests/test_cinder_utils.py	2013-09-23 18:43:55 +0000
+++ unit_tests/test_cinder_utils.py	2013-09-24 16:42:36 +0000
@@ -204,11 +204,12 @@
 
     def test_ensure_ceph_pool(self):
         self.ceph_pool_exists.return_value = False
-        cinder_utils.ensure_ceph_pool(service='cinder')
+        cinder_utils.ensure_ceph_pool(service='cinder', replicas=3)
         self.ceph_create_pool.assert_called_with(service='cinder',
-                                                 name='cinder')
+                                                 name='cinder',
+                                                 replicas=3)
 
     def test_ensure_ceph_pool_already_exists(self):
         self.ceph_pool_exists.return_value = True
-        cinder_utils.ensure_ceph_pool(service='cinder')
+        cinder_utils.ensure_ceph_pool(service='cinder', replicas=3)
         self.assertFalse(self.ceph_create_pool.called)