From: Boris Ranto Date: Fri, 29 Jun 2018 11:25:17 +0000 (+0200) Subject: rpm: use_epel is no longer defined X-Git-Tag: v2.0~9^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e1c6bebeaeea700a38e924975ac0332e9d012ac2;p=cephmetrics.git rpm: use_epel is no longer defined Signed-off-by: Boris Ranto --- diff --git a/patches/0001-ansible-Disable-devel_mode.patch b/patches/0001-ansible-Disable-devel_mode.patch index 5ddfac0..cb2a620 100644 --- a/patches/0001-ansible-Disable-devel_mode.patch +++ b/patches/0001-ansible-Disable-devel_mode.patch @@ -5,14 +5,14 @@ Subject: [PATCH] ansible: Disable devel_mode Signed-off-by: Boris Ranto --- - ansible/roles/cephmetrics-common/tasks/merge_vars.yml | 7 +++++++ - 1 file changed, 7 insertions(+) + ansible/roles/cephmetrics-common/tasks/merge_vars.yml | 6 ++++++ + 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 --- a/ansible/roles/cephmetrics-common/tasks/merge_vars.yml +++ b/ansible/roles/cephmetrics-common/tasks/merge_vars.yml -@@ -3,3 +3,10 @@ +@@ -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() }}" no_log: true @@ -21,7 +21,6 @@ index f8dbcd0..15d2a6b 100644 + assert: + that: + - devel_mode == False -+ - use_epel == False + msg: "Devel mode is not supported in the downstream builds" -- 2.9.5