remove the use of iteritems

iteritems is a py2 callable and will break when using py3.

Change-Id: Icea444baea8f3597cb8dd24e3d61e9ed0926cdf5
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>

action/_v1_config_template.py

@@ -356,7 +356,7 @@ def _merge_dict(self, base_items, new_items, list_extend=True):
         :param new_items: ``dict``
         :returns: ``dict``
         """
-        for key, value in new_items.iteritems():
+        for key, value in new_items.items():
             if isinstance(value, dict):
                 base_items[key] = self._merge_dict(
                     base_items.get(key, {}),

library/magnum

@@ -199,7 +199,7 @@ class ManageMagnum(object):
             )
         else:
             try:
-                for opt, val in template_opts.iteritems():
+                for opt, val in template_opts.items():
                     if (val != getattr(template, opt) and
                             val is not None):
                         updates.append({opt: val})