]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-deploy.git/commitdiff
mon: no need to decode - already done by remoto
authorAlfredo Deza <adeza@redhat.com>
Wed, 1 May 2019 13:35:12 +0000 (09:35 -0400)
committerAlfredo Deza <adeza@redhat.com>
Wed, 1 May 2019 18:12:29 +0000 (14:12 -0400)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
Resolves: rm#39489

ceph_deploy/mon.py

index 12f4a725198d71f882022ac13b908d69e480a923..cd883b5f0503b7ce6b381c3263527997042d830d 100644 (file)
@@ -44,7 +44,7 @@ def mon_status_check(conn, logger, hostname, args):
         logger.error(line)
 
     try:
-        return json.loads(b''.join(out).decode('utf-8'))
+        return json.loads(''.join(out))
     except ValueError:
         return {}
 
@@ -589,8 +589,8 @@ def is_running(conn, args):
         conn,
         args
     )
-    result_string = b' '.join(stdout)
-    for run_check in [b': running', b' start/running']:
+    result_string = ' '.join(stdout)
+    for run_check in [': running', b' start/running']:
         if run_check in result_string:
             return True
     return False