Add travis test image python3

Use items function instead of iteritems
ernestas-poskus · Sep 16, 2017 · 152d9f0 · 152d9f0
1 parent 99fb6ff
commit 152d9f0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,6 +9,9 @@ env:
     - distro: ernestasposkus/ubuntu1604
       init: /lib/systemd/systemd
       run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
+    - distro: ernestasposkus/python3
+      init: /lib/systemd/systemd
+      run_opts: "--privileged --volume=/sys/fs/cgroup:/sys/fs/cgroup:ro"
 
 services:
   - docker

diff --git a/templates/alert_manager.service.j2 b/templates/alert_manager.service.j2
@@ -6,7 +6,7 @@ After=network.target
 Wants=network.target
 
 [Service]
-ExecStart={{ prometheus_install_dir }}/{{ prometheus_alert_manager_archive }}/alertmanager {% for key, value in prometheus_alert_manager_service_config.iteritems() if value is not none %}-{{ key }}={{ value }} {% endfor %}
+ExecStart={{ prometheus_install_dir }}/{{ prometheus_alert_manager_archive }}/alertmanager {% for key, value in prometheus_alert_manager_service_config.items() if value is not none %}-{{ key }}={{ value }} {% endfor %}
 
 Restart=always
 RestartSec=20

diff --git a/templates/node_exporter.service.j2 b/templates/node_exporter.service.j2
@@ -6,7 +6,7 @@ After=network.target
 Wants=network.target
 
 [Service]
-ExecStart={{ prometheus_install_dir }}/{{ prometheus_node_exporter_archive }}/node_exporter {% for key, value in prometheus_node_exporter_service_config.iteritems() if value is not none %}-{{ key }}={{ value }} {% endfor %}
+ExecStart={{ prometheus_install_dir }}/{{ prometheus_node_exporter_archive }}/node_exporter {% for key, value in prometheus_node_exporter_service_config.items() if value is not none %}-{{ key }}={{ value }} {% endfor %}
 
 Restart=always
 RestartSec=20

diff --git a/templates/prometheus.service.j2 b/templates/prometheus.service.j2
@@ -6,7 +6,7 @@ After=network.target
 Wants=network.target
 
 [Service]
-ExecStart={{ prometheus_install_dir }}/{{ prometheus_archive }}/prometheus {% for key, value in prometheus_service_config.iteritems() if value is not none %}-{{ key }}={{ value }} {% endfor %}
+ExecStart={{ prometheus_install_dir }}/{{ prometheus_archive }}/prometheus {% for key, value in prometheus_service_config.items() if value is not none %}-{{ key }}={{ value }} {% endfor %}
 
 Restart=always
 RestartSec=20