From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 5 Jul 2018 15:20:56 +0000 (+0200)
Subject: mgr: replace iteritems with six.iteritems (influx)
X-Git-Tag: v12.2.8~35^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c6e32f287efd27051ff4a7feb9044fbcc7f503dc;p=ceph.git

mgr: replace iteritems with six.iteritems (influx)

Fixes: http://tracker.ceph.com/issues/24779
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit a62ab8ae8c91b91bb6c5367a6af197e5d85fe10a)

Conflicts:
	src/pybind/mgr/influx/module.py (trivial)
---

diff --git a/src/pybind/mgr/influx/module.py b/src/pybind/mgr/influx/module.py
index b4039ac70806..96eb33ce54a6 100644
--- a/src/pybind/mgr/influx/module.py
+++ b/src/pybind/mgr/influx/module.py
@@ -2,6 +2,7 @@ from datetime import datetime
 from threading import Event
 import json
 import errno
+import six
 import time
 
 from mgr_module import MgrModule
@@ -110,7 +111,7 @@ class Module(MgrModule):
 
         now = datetime.utcnow().isoformat() + 'Z'
 
-        for daemon, counters in self.get_all_perf_counters().iteritems():
+        for daemon, counters in six.iteritems(self.get_all_perf_counters()):
             svc_type, svc_id = daemon.split(".", 1)
             metadata = self.get_metadata(svc_type, svc_id)