From fac4baa0fbdef7adee8aefcfe62aea5230553ef9 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Tue, 27 Nov 2018 14:26:39 +0100 Subject: [PATCH] Fix for python3 ansible We can't use keys in python3, switching to list. Signed-off-by: Boris Ranto --- ansible/roles/ceph-defaults/tasks/merge_vars.yml | 2 +- ansible/roles/ceph-node-exporter/tasks/merge_vars.yml | 6 +----- patches/0001-ansible-Disable-devel_mode.patch | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) mode change 100644 => 120000 ansible/roles/ceph-node-exporter/tasks/merge_vars.yml diff --git a/ansible/roles/ceph-defaults/tasks/merge_vars.yml b/ansible/roles/ceph-defaults/tasks/merge_vars.yml index f8dbcd0..8b6ab2c 100644 --- a/ansible/roles/ceph-defaults/tasks/merge_vars.yml +++ b/ansible/roles/ceph-defaults/tasks/merge_vars.yml @@ -1,5 +1,5 @@ --- - name: Combine default settings and user-defined variables set_fact: {"{{ item }}": "{% if vars[item] is not defined %}{{ defaults[item] }}{% elif vars[item] is mapping %}{{ defaults[item]|combine(vars[item]|default({})) }}{% else %}{{ vars[item] }}{% endif %}"} - with_items: "{{ defaults.keys() }}" + with_items: "{{ defaults | list }}" no_log: true diff --git a/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml b/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml deleted file mode 100644 index f8dbcd0..0000000 --- a/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Combine default settings and user-defined variables - set_fact: {"{{ item }}": "{% if vars[item] is not defined %}{{ defaults[item] }}{% elif vars[item] is mapping %}{{ defaults[item]|combine(vars[item]|default({})) }}{% else %}{{ vars[item] }}{% endif %}"} - with_items: "{{ defaults.keys() }}" - no_log: true diff --git a/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml b/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml new file mode 120000 index 0000000..299adff --- /dev/null +++ b/ansible/roles/ceph-node-exporter/tasks/merge_vars.yml @@ -0,0 +1 @@ +../../ceph-defaults/tasks/merge_vars.yml \ No newline at end of file diff --git a/patches/0001-ansible-Disable-devel_mode.patch b/patches/0001-ansible-Disable-devel_mode.patch index 96ae643..671670e 100644 --- a/patches/0001-ansible-Disable-devel_mode.patch +++ b/patches/0001-ansible-Disable-devel_mode.patch @@ -14,7 +14,7 @@ index f8dbcd0..15d2a6b 100644 +++ b/ansible/roles/ceph-defaults/tasks/merge_vars.yml @@ -3,3 +3,9 @@ set_fact: {"{{ item }}": "{% if vars[item] is not defined %}{{ defaults[item] }}{% elif vars[item] is mapping %}{{ defaults[item]|combine(vars[item]|default({})) }}{% else %}{{ vars[item] }}{% endif %}"} - with_items: "{{ defaults.keys() }}" + with_items: "{{ defaults | list }}" no_log: true + +- name: Make sure devel_mode is not on -- 2.47.3