Merge pull request #144 from medunigraz/master

Use items() instead of iteritems() for Python3 compatibility.

Author: fpytloun

linux/files/apt.conf

@@ -1,7 +1,7 @@
 // apt.conf file managed by salt-minion
 // DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN
 
-{%- for key, value in config.iteritems() %}
+{%- for key, value in config.items() %}
 {{ key }} {% if value is iterable and value is not string %}{ {% for entry in value %}"{{ entry }}";{% endfor %} } {% else %}{{ value }};{% endif %}
 {%- endfor %}
 {#-

linux/files/cgconfig.conf

@@ -2,11 +2,11 @@
 ##
 ## This is cgconfig configuration file is managed by Salt
 ##
-{%- for cgroup_name, cg in system.cgroup.group.iteritems() %}
+{%- for cgroup_name, cg in system.cgroup.group.items() %}
 group {{ cgroup_name }} {
-  {%- for controller_name, controller in cg.controller.iteritems() %}
+  {%- for controller_name, controller in cg.controller.items() %}
         {{ controller_name }} {
-    {%- for v_name, v in controller.iteritems() %}
+    {%- for v_name, v in controller.items() %}
                 {{ controller_name }}.{{ v_name }}="{{ v.value }}";
     {%- endfor %}
 

linux/files/cgrules.conf

@@ -3,8 +3,8 @@
 ## This is cgrules configuration file is managed by Salt
 ##
 #<user/group>         <controller(s)>         <cgroup>
-{%- for cgroup_name, cg in system.cgroup.group.iteritems() %}
+{%- for cgroup_name, cg in system.cgroup.group.items() %}
 {%- for subject in cg.mapping.subjects %}
-{{ subject }}{% raw %}         {% endraw %}{%- for controller_name, controller in cg.controller.iteritems() -%}{{ controller_name }}{%- if not loop.last -%},{%- endif -%}{%- endfor -%}{% raw %}         {% endraw %}{{ cgroup_name }}
+{{ subject }}{% raw %}         {% endraw %}{%- for controller_name, controller in cg.controller.items() -%}{{ controller_name }}{%- if not loop.last -%},{%- endif -%}{%- endfor -%}{% raw %}         {% endraw %}{{ cgroup_name }}
 {%- endfor %}
 {%- endfor %}

linux/files/dhclient.conf

@@ -95,7 +95,7 @@ require {{ section.require|join(",\n    ") }};
 option rfc3442-classless-static-routes code 121 = array of unsigned integer 8;
 {{ render_section(dhclient) }}
 {%- if dhclient.get("interface") -%}
-{%- for iface_name, options in dhclient.interface.iteritems() %}
+{%- for iface_name, options in dhclient.interface.items() %}
 {%- if network.interface.get(iface_name) and network.interface.get(iface_name).enabled == True
    and network.interface.get(iface_name).proto == 'dhcp' -%}
 interface "{{ iface_name }}" {

linux/files/dpdk_interfaces

@@ -1,5 +1,5 @@
 {%- from "linux/map.jinja" import network with context %}
-{%- for interface_name, interface in network.interface.iteritems() %}
+{%- for interface_name, interface in network.interface.items() %}
 {%- if 'dpdk' in interface.type and interface.pci is defined %}
 pci {{ interface.pci }} {{ interface.driver }}
 {%- endif %}

linux/files/etc_environment

@@ -1,5 +1,5 @@
 
-{%- for name,value in variables.iteritems() if not name.lower().endswith('_proxy') %}
+{%- for name,value in variables.items() if not name.lower().endswith('_proxy') %}
 
 {%- if value is sequence and value is not string %}
 {{ name }}="{{ value|join(':') }}"

linux/files/grub_hugepages

@@ -1,2 +1,2 @@
 {%- from "linux/map.jinja" import system with context %}
-GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT {%- for hugepages_type, hugepages in system.kernel.hugepages.iteritems() %}{%- if hugepages.get('default', False) %} default_hugepagesz={{ hugepages.size }} {%- endif %} hugepagesz={{ hugepages.size }} hugepages={{ hugepages.count }} {%- endfor %}"
+GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT {%- for hugepages_type, hugepages in system.kernel.hugepages.items() %}{%- if hugepages.get('default', False) %} default_hugepagesz={{ hugepages.size }} {%- endif %} hugepagesz={{ hugepages.size }} hugepages={{ hugepages.count }} {%- endfor %}"

linux/files/hosts

@@ -31,7 +31,7 @@
         'ip6-allhosts'
     ],
 } -%}
-{%- for name, host in host_dict.iteritems() -%}
+{%- for name, host in host_dict.items() -%}
 {%- for hname in host.names -%}
 {%- if hname in hosts.get('127.0.1.1', []) -%}
 {%- do hosts.pop('127.0.1.1') -%}

linux/files/lvm.conf

@@ -129,7 +129,7 @@ devices {
         # Example
         # Accept every block device:
 
-        filter = [ {%- for vgname, vg in storage.lvm.iteritems() %}{%- if vg.get('enabled', True) %}{%- for dev in vg.devices %}"a|{{ dev }}*|"{%- if not loop.last %},{%- endif %}{%- endfor %}{%- endif %}{%- endfor %}, "r|.*|" ]
+        filter = [ {%- for vgname, vg in storage.lvm.items() %}{%- if vg.get('enabled', True) %}{%- for dev in vg.devices %}"a|{{ dev }}*|"{%- if not loop.last %},{%- endif %}{%- endfor %}{%- endif %}{%- endfor %}, "r|.*|" ]
 
         # filter = [ "a|.*/|" ]
         # Reject the cdrom drive:

linux/files/motd.sh

@@ -1,7 +1,7 @@
 {%- from "linux/map.jinja" import system with context -%}
 {%- for motd in system.motd -%}
 {%- if loop.index == index -%}
-{%- for name, value in motd.iteritems() -%}
+{%- for name, value in motd.items() -%}
 {%- if name == motd_name -%}{{ value }}{%- endif %}
 {%- endfor -%}
 {%- endif -%}