diff --git a/ceph/__init__.py b/ceph/__init__.py index 7acbc52..c30bfd5 100644 --- a/ceph/__init__.py +++ b/ceph/__init__.py @@ -1338,7 +1338,7 @@ def osdize_dir(path, encrypt=False): if cmp_pkgrevno('ceph', "0.56.6") < 0: log('Unable to use directories for OSDs with ceph < 0.56.6', level=ERROR) - raise + return mkdir(path, owner=ceph_user(), group=ceph_user(), perms=0o755) chownr('/var/lib/ceph', ceph_user(), ceph_user()) diff --git a/ceph/ceph_broker.py b/ceph/ceph_broker.py index f1e59da..1f6db8c 100644 --- a/ceph/ceph_broker.py +++ b/ceph/ceph_broker.py @@ -168,6 +168,8 @@ def handle_add_permissions_to_key(request, service): A group can optionally have a namespace defined that will be used to further restrict pool access. """ + resp = {'exit-code': 0} + service_name = request.get('name') group_name = request.get('group') group_namespace = request.get('group-namespace') @@ -190,6 +192,8 @@ def handle_add_permissions_to_key(request, service): group_namespace) update_service_permissions(service_name, service_obj, group_namespace) + return resp + def update_service_permissions(service, service_obj=None, namespace=None): """Update the key permissions for the named client in Ceph"""