From: Noah Watkins <noahwatkins@gmail.com>
Date: Sat, 13 Oct 2018 16:05:06 +0000 (-0700)
Subject: mgr: python 3 compat fixes
X-Git-Tag: v12.2.11~63^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25f9b7b24f00cb4acdd8b4da1fd6a0e343c95f36;p=ceph.git

mgr: python 3 compat fixes

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
---

diff --git a/src/pybind/mgr/balancer/module.py b/src/pybind/mgr/balancer/module.py
index 529ee012d612..03f454a05bc7 100644
--- a/src/pybind/mgr/balancer/module.py
+++ b/src/pybind/mgr/balancer/module.py
@@ -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),
             }