aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorpaulrbr-fl <43074087+paulrbr-fl@users.noreply.github.com>2018-09-21 11:09:32 +0200
committerGitHub <noreply@github.com>2018-09-21 11:09:32 +0200
commit4eeb5deae31c0173f46d4a2d2a6835612157ced7 (patch)
tree1dd8548155e47d7b0176a90f775b4ed14231cb64
parent84f2505fcd00182ab3b6f24fdbb2412fb25743ac (diff)
parent1fb29e0e0261bc705fdd4bc26958d2248cc380dd (diff)
downloadansible-clever-1.2.tar.gz
ansible-clever-1.2.tar.zst
ansible-clever-1.2.zip
Merge pull request #10 from paulrbr-fl/python3-compatv1.2
python3: Change iteritems() to items() to be compatible with py3
-rw-r--r--tasks/setup.yml2
-rw-r--r--templates/env.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/tasks/setup.yml b/tasks/setup.yml
index ac9fdcb..0dfcddf 100644
--- a/tasks/setup.yml
+++ b/tasks/setup.yml
@@ -15,7 +15,7 @@
15 - "--strip-components=1" 15 - "--strip-components=1"
16 src: https://clever-tools.cellar.services.clever-cloud.com/releases/{{ clever_cli_version }}/clever-tools-{{ clever_cli_version }}_linux.tar.gz 16 src: https://clever-tools.cellar.services.clever-cloud.com/releases/{{ clever_cli_version }}/clever-tools-{{ clever_cli_version }}_linux.tar.gz
17 dest: "{{ ansible_env.HOME }}/{{ clever_user_path }}" 17 dest: "{{ ansible_env.HOME }}/{{ clever_user_path }}"
18 when: clever_returned_version|failed or clever_returned_version.stdout != clever_cli_version 18 when: clever_returned_version is failed or clever_returned_version.stdout != clever_cli_version
19 19
20- name: Install helper scripts 20- name: Install helper scripts
21 copy: 21 copy:
diff --git a/templates/env.j2 b/templates/env.j2
index d543a81..6ed6469 100644
--- a/templates/env.j2
+++ b/templates/env.j2
@@ -1,3 +1,3 @@
1{% for key, value in (clever_base_env | combine(clever_env)).iteritems() %} 1{% for key, value in (clever_base_env | combine(clever_env)).items() %}
2{{ key }}={{ value }} 2{{ key }}={{ value }}
3{% endfor %} 3{% endfor %}