]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr: python 3 compat fixes 25258/head
authorNoah Watkins <noahwatkins@gmail.com>
Sat, 13 Oct 2018 16:05:06 +0000 (09:05 -0700)
committerKonstantin Shalygin <k0ste@k0ste.ru>
Wed, 28 Nov 2018 01:16:22 +0000 (08:16 +0700)
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
(cherry picked from commit 6dc95544512362c202535139c323717ec867e20b)

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

src/pybind/mgr/balancer/module.py

index 529ee012d6124b9f1333982ad2e8ed1b49fe2423..03f454a05bc7abdb8aab58ef847254ac718c87d9 100644 (file)
@@ -277,7 +277,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),
             }