import 15.2.0 Octopus source

[ceph.git] / ceph / qa / tasks / dnsmasq.py

diff --git a/ceph/qa/tasks/dnsmasq.py b/ceph/qa/tasks/dnsmasq.py
index 764d742fa7183030fa01e5596a9ee9cf67b6d7e2..2bf3feaf083714e490c58f5e6ccca15f168c823d 100644 (file)
--- a/ceph/qa/tasks/dnsmasq.py
+++ b/ceph/qa/tasks/dnsmasq.py
@@ -67,7 +67,7 @@ def setup_dnsmasq(remote, testdir, cnames):
     # add address entries for each cname
     dnsmasq = "server=8.8.8.8\nserver=8.8.4.4\n"
     address_template = "address=/{cname}/{ip_address}\n"
-    for cname, ip_address in cnames.iteritems():
+    for cname, ip_address in cnames.items():
         dnsmasq += address_template.format(cname=cname, ip_address=ip_address)
 
     # write to temporary dnsmasq file
@@ -129,7 +129,7 @@ def task(ctx, config):
 
     # multiple roles may map to the same remote, so collect names by remote
     remote_names = {}
-    for role, cnames in config.iteritems():
+    for role, cnames in config.items():
         remote = get_remote_for_role(ctx, role)
         if remote is None:
             raise ConfigError('no remote for role %s' % role)
@@ -144,7 +144,7 @@ def task(ctx, config):
                 names[cname] = remote.ip_address
         elif isinstance(cnames, dict):
             # when given a dict, look up the remote ip for each
-            for cname, client in cnames.iteritems():
+            for cname, client in cnames.items():
                 r = get_remote_for_role(ctx, client)
                 if r is None:
                     raise ConfigError('no remote for role %s' % client)
@@ -160,7 +160,7 @@ def task(ctx, config):
 
     # run subtasks for each unique remote
     subtasks = []
-    for remote, cnames in remote_names.iteritems():
+    for remote, cnames in remote_names.items():
         subtasks.extend([ lambda r=remote: install_dnsmasq(r) ])
         subtasks.extend([ lambda r=remote: backup_resolv(r, resolv_bak) ])
         subtasks.extend([ lambda r=remote: replace_resolv(r, resolv_tmp) ])