]> git-server-git.apps.pok.os.sepia.ceph.com Git - cephmetrics.git/commitdiff
rpm: use_epel is no longer defined 203/head
authorBoris Ranto <branto@redhat.com>
Fri, 29 Jun 2018 11:25:17 +0000 (13:25 +0200)
committerBoris Ranto <branto@redhat.com>
Tue, 3 Jul 2018 21:57:07 +0000 (23:57 +0200)
Signed-off-by: Boris Ranto <branto@redhat.com>
patches/0001-ansible-Disable-devel_mode.patch

index 5ddfac0803933e0be1475d34149877b9aa638bf4..cb2a62085c0d0b4bdafb95c92485ba68dd6343ff 100644 (file)
@@ -5,14 +5,14 @@ Subject: [PATCH] ansible: Disable devel_mode
 
 Signed-off-by: Boris Ranto <branto@redhat.com>
 ---
- ansible/roles/cephmetrics-common/tasks/merge_vars.yml | 7 +++++++
- 1 file changed, 7 insertions(+)
+ ansible/roles/cephmetrics-common/tasks/merge_vars.yml | ++++++
+ 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