From: Bruceforce <markus.greis@gmx.de>
Date: Tue, 19 Mar 2019 17:23:56 +0000 (+0100)
Subject: ceph_crush: fix rstrip for python 3
X-Git-Tag: v4.0.0rc1~29
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6d506dba1a6fb3a827460d3a7090517cf3241c39;p=ceph-ansible.git

ceph_crush: fix rstrip for python 3
Removing bytes literals since rstrip only supports type String or None.

Please backport to stable-3.2

Signed-off-by: Bruceforce <markus.greis@gmx.de>
---

diff --git a/library/ceph_crush.py b/library/ceph_crush.py
index 1289e9080..77714bb72 100644
--- a/library/ceph_crush.py
+++ b/library/ceph_crush.py
@@ -145,7 +145,7 @@ def exec_commands(module, cmd_list):
     Creates Ceph commands
     '''
     for cmd in cmd_list:
-        rc, out, err = module.run_command(cmd, encoding=None)
+        rc, out, err = module.run_command(cmd)
     return rc, cmd, out, err
 
 
@@ -193,8 +193,8 @@ def run_module():
         end=str(endd),
         delta=str(delta),
         rc=rc,
-        stdout=out.rstrip(b"\r\n"),
-        stderr=err.rstrip(b"\r\n"),
+        stdout=out.rstrip("\r\n"),
+        stderr=err.rstrip("\r\n"),
         changed=True,
     )