From: zhengyin <zhengyin@cmss.chinamobile.com>
Date: Wed, 6 Nov 2019 03:57:40 +0000 (+0800)
Subject: pybind/mgr: Cancel output color control
X-Git-Tag: v13.2.9~68^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1a67136d8669776234178f7119a34c66dec59bf1;p=ceph.git

pybind/mgr: Cancel output color control

When I do "ceph osd status" command, the units are not visible
when using a black background, So cancel outpul color control

Fixes: https://tracker.ceph.com/issues/42517
Signed-off-by: Zheng Yin <zhengyin@cmss.chinamobile.com>
(cherry picked from commit ca2675e215acc8fbfb2d730b9c1f9f3aafc3e67d)

Conflicts:
	src/pybind/mgr/mgr_util.py
- file does not exist in mimic; made the changes manually
---

diff --git a/src/pybind/mgr/status/module.py b/src/pybind/mgr/status/module.py
index e6b5325bc8f..c6d2585a449 100644
--- a/src/pybind/mgr/status/module.py
+++ b/src/pybind/mgr/status/module.py
@@ -91,10 +91,10 @@ class Module(MgrModule):
         else:
             return formatted
 
-    def format_dimless(self, n, width, colored=True):
+    def format_dimless(self, n, width, colored=False):
         return self.format_units(n, width, colored, decimal=True)
     
-    def format_bytes(self, n, width, colored=True):
+    def format_bytes(self, n, width, colored=False):
         return self.format_units(n, width, colored, decimal=False)
         
     def get_latest(self, daemon_type, daemon_name, stat):