]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: python 3 compat fixes 25292/head
authorNoah Watkins <noahwatkins@gmail.com>
Sat, 13 Oct 2018 16:05:06 +0000 (09:05 -0700)
committerNathan Cutler <ncutler@suse.com>
Tue, 27 Nov 2018 22:17:43 +0000 (23:17 +0100)
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit 6dc95544512362c202535139c323717ec867e20b)

Conflicts:
src/pybind/mgr/crash/module.py
- file does not exist in mimic: omitted

src/pybind/mgr/balancer/module.py

index 8f0ea5fc84a59d22c57e8bd668b60eb58e588f03..632ebde75ffe5ae0278c07fdc0c8fb645ba20810 100644 (file)
@@ -291,7 +291,7 @@ class Module(MgrModule):
         self.log.warn("Handling command: '%s'" % str(command))
         if command['prefix'] == 'balancer status':
             s = {
-                'plans': self.plans.keys(),
+                'plans': list(self.plans.keys()),
                 'active': self.active,
                 'mode': self.get_config('mode', default_mode),
             }