]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
LocalCephManager.admin_socket: add timeout kwarg
authorZack Cerza <zack@redhat.com>
Wed, 24 Oct 2018 21:54:16 +0000 (21:54 +0000)
committerZack Cerza <zack@redhat.com>
Wed, 24 Oct 2018 22:04:37 +0000 (16:04 -0600)
This fixes "TypeError: admin_socket() got an unexpected keyword argument
'timeout'". The value is never used.

Signed-off-by: Zack Cerza <zack@redhat.com>
qa/tasks/vstart_runner.py

index 46828429bed890a49dc5a530d5e0255f31112cfc..e4cf25000339f9691e1d8851cddd21d991b030d7 100644 (file)
@@ -606,7 +606,7 @@ class LocalCephManager(CephManager):
         proc = self.controller.run([os.path.join(BIN_PREFIX, "ceph")] + list(args), **kwargs)
         return proc.exitstatus
 
-    def admin_socket(self, daemon_type, daemon_id, command, check_status=True):
+    def admin_socket(self, daemon_type, daemon_id, command, check_status=True, timeout=None):
         return self.controller.run(
             args=[os.path.join(BIN_PREFIX, "ceph"), "daemon", "{0}.{1}".format(daemon_type, daemon_id)] + command, check_status=check_status
         )