openstack
/
charm-cinder-ceph
Code Issues Proposed changes

Fixup hook use of CEPH_CONF

This commit is contained in:
James Page 2014-02-12 10:48:29 +00:00
parent f627f83fa2
commit 16eda8c99f
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/cinder_hooks.py
View File

@ -66,7 +66,7 @@ def ceph_changed():
user='cinder', group='cinder'):
log('Could not create ceph keyring: peer not ready?')
else:
CONFIGS.write(CEPH_CONF)
CONFIGS.write_all()
set_ceph_env_variables(service=svc)
if eligible_leader(None):
ensure_ceph_pool(service=svc,

5
unit_tests/test_cinder_hooks.py
View File

@ -86,8 +86,7 @@ class TestJoinedHooks(CharmTestCase):
user='cinder',
group='cinder')
self.ensure_ceph_pool.assert_called_with(service='cinder', replicas=2)
for c in [call('/etc/ceph/ceph.conf')]:
self.assertIn(c, self.CONFIGS.write.call_args_list)
self.assertTrue(self.CONFIGS.write_all.called)
self.set_ceph_env_variables.assert_called_with(service='cinder')
def test_ceph_changed_no_keys(self):
@ -99,7 +98,7 @@ class TestJoinedHooks(CharmTestCase):
# NOTE(jamespage): If ensure_ceph keyring fails, then
# the hook should just exit 0 and return.
self.assertTrue(self.log.called)
self.assertFalse(self.CONFIGS.write.called)
self.assertFalse(self.CONFIGS.write_all.called)
def test_ceph_changed_no_leadership(self):
'''It does not attempt to create ceph pool if not leader'''