Ensure ceph keyring has correct perms

This commit is contained in:
James Page 2017-08-02 11:50:46 +01:00
parent bff97e8614
commit a626949459
2 changed files with 9 additions and 5 deletions

View File

@ -74,8 +74,10 @@ def storage_ceph_connected(ceph):
@reactive.when('storage-ceph.available')
def configure_ceph(ceph):
ceph_helper.create_keyring(hookenv.service_name(),
ceph.key())
ceph_helper.ensure_ceph_keyring(service=hookenv.service_name(),
key=ceph.key(),
user='gnocchi',
group='gnocchi')
@reactive.when_not('storage-ceph.connected')

View File

@ -109,9 +109,11 @@ class TestHandlers(test_utils.PatchHelper):
mock_ceph.key.return_value = 'testkey'
mock_hookenv.service_name.return_value = 'gnocchi'
handlers.configure_ceph(mock_ceph)
mock_ceph_helper.create_keyring.assert_called_once_with(
'gnocchi',
'testkey',
mock_ceph_helper.ensure_ceph_keyring.assert_called_once_with(
service='gnocchi',
key='testkey',
user='gnocchi',
group='gnocchi'
)
mock_ceph.key.assert_called_once_with()