From: Boris Ranto Date: Tue, 9 Jul 2019 18:41:38 +0000 (+0200) Subject: patches: Fix patch to apply cleanly X-Git-Tag: v2.0.5^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F239%2Fhead;p=cephmetrics.git patches: Fix patch to apply cleanly Signed-off-by: Boris Ranto --- diff --git a/patches/0001-ansible-Disable-devel_mode.patch b/patches/0001-ansible-Disable-devel_mode.patch index cb2a620..901a705 100644 --- a/patches/0001-ansible-Disable-devel_mode.patch +++ b/patches/0001-ansible-Disable-devel_mode.patch @@ -1,6 +1,6 @@ -From 49ffd15645a8b377b600f44102cad613a71fdd2b Mon Sep 17 00:00:00 2001 +From ae1da1bb2db973756ffeb838861649fcd97d5975 Mon Sep 17 00:00:00 2001 From: Boris Ranto -Date: Fri, 6 Oct 2017 12:22:37 +0200 +Date: Tue, 9 Jul 2019 20:39:07 +0200 Subject: [PATCH] ansible: Disable devel_mode Signed-off-by: Boris Ranto @@ -9,11 +9,11 @@ Signed-off-by: Boris Ranto 1 file changed, 6 insertions(+) diff --git a/ansible/roles/cephmetrics-common/tasks/merge_vars.yml b/ansible/roles/cephmetrics-common/tasks/merge_vars.yml -index f8dbcd0..15d2a6b 100644 +index acfdde0..2f8a979 100644 --- a/ansible/roles/cephmetrics-common/tasks/merge_vars.yml +++ b/ansible/roles/cephmetrics-common/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 %}"} + 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 %}"} # noqa 204 with_items: "{{ defaults.keys() }}" no_log: true + @@ -23,5 +23,5 @@ index f8dbcd0..15d2a6b 100644 + - devel_mode == False + msg: "Devel mode is not supported in the downstream builds" -- -2.9.5 +2.20.1