]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr: Cancel output color control 31805/head
authorzhengyin <zhengyin@cmss.chinamobile.com>
Wed, 6 Nov 2019 03:57:40 +0000 (11:57 +0800)
committerNathan Cutler <ncutler@suse.com>
Fri, 22 Nov 2019 08:35:33 +0000 (09:35 +0100)
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

src/pybind/mgr/status/module.py

index e6b5325bc8ff9dbbf2456b6a04954d960bd48c79..c6d2585a44963d77cdbaebdd0e81d9812981247d 100644 (file)
@@ -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):