Merge pull request #2 from netmanagers/master

s/iteritems/items/g
saltstack-formulas · Apr 3, 2019 · a68c972 · a68c972
2 parents e4d60d0 + 827ae47
commit a68c972
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/nut/templates/ups-conf.jinja b/nut/templates/ups-conf.jinja
@@ -143,10 +143,10 @@
 maxretry = {{ ups.maxretry }}
 retrydelay = {{ ups.retrydelay }}
 
-{%- for name, params in ups.units.iteritems() %}
+{%- for name, params in ups.units.items() %}
 
 [{{ name }}]
-  {%- for k,v in params.iteritems() %}
+  {%- for k,v in params.items() %}
   {{ k }} = {{ v }}
   {%- endfor %}
 

diff --git a/nut/templates/upsd-users.jinja b/nut/templates/upsd-users.jinja
@@ -74,9 +74,9 @@
 #
 # MONITOR myups@localhost 1 upsmon pass master	(or slave)
 
-{%- for name, params in users.iteritems() %}
+{%- for name, params in users.items() %}
 [{{ name }}]
-  {%- for k,v in params.iteritems() %}
+  {%- for k,v in params.items() %}
     {%- if k == 'upsmon' %}
     {{ k }} {{ v }}
     {%- else %}

diff --git a/nut/templates/upsmon-conf.jinja b/nut/templates/upsmon-conf.jinja
@@ -92,7 +92,7 @@ RUN_AS_USER {{ upsmon.run_as_user }}
   {%- if upsmon.monitor is string %}
 MONITOR {{ upsmon.monitor }}
   {%- elif upsmon.monitor is mapping %}
-    {%- for u, p in upsmon.monitor.iteritems() %}
+    {%- for u, p in upsmon.monitor.items() %}
 MONITOR {{ p['system'] }} {{ p['powervalue'] | default('1') }} {{ p['username'] }} {{ p['password'] }} {{ p['type'] |default('master') }}
     {%- endfor %}
   {%- else %}