]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph_manager: extend do_put and do_get to allow a namespace
authorSamuel Just <sjust@redhat.com>
Mon, 4 Apr 2016 17:52:36 +0000 (10:52 -0700)
committerSamuel Just <sjust@redhat.com>
Thu, 7 Apr 2016 22:35:30 +0000 (15:35 -0700)
Signed-off-by: Samuel Just <sjust@redhat.com>
tasks/ceph_manager.py

index 67b1b70ecf65e12b195596a288e9f81debc54b3a..3d4d8e26aaa4aea4114c0314c5c190542a1f4b60 100644 (file)
@@ -873,26 +873,30 @@ class CephManager:
             args.append('--no-cleanup')
         return self.do_rados(self.controller, map(str, args))
 
-    def do_put(self, pool, obj, fname):
+    def do_put(self, pool, obj, fname, namespace=None):
         """
         Implement rados put operation
         """
+        args = ['-p', pool]
+        if namespace is not None:
+            args += ['-N', namespace]
+        args += [
+            'put',
+            obj,
+            fname
+        ]
         return self.do_rados(
             self.controller,
-            [
-                '-p',
-                pool,
-                'put',
-                obj,
-                fname
-                ]
+            args
             )
 
-    def do_get(self, pool, obj, fname='/dev/null'):
+    def do_get(self, pool, obj, fname='/dev/null', namespace=None):
         """
         Implement rados get operation
         """
         args = ['-p', pool]
+        if namespace is not None:
+            args += ['-N', namespace]
         args += [
             'get',
             obj,