From: Boris Ranto <branto@redhat.com>
Date: Tue, 10 Oct 2017 22:24:27 +0000 (+0200)
Subject: rpm: Move the rpm patch off the gitroot
X-Git-Tag: v1.0~6^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a34b9acafc64a01fbe9c4eff048813d4b4b5bd4f;p=cephmetrics.git

rpm: Move the rpm patch off the gitroot

Signed-off-by: Boris Ranto <branto@redhat.com>
---

diff --git a/0001-ansible-Disable-devel_mode.patch b/0001-ansible-Disable-devel_mode.patch
deleted file mode 100644
index 5ddfac0..0000000
--- a/0001-ansible-Disable-devel_mode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 49ffd15645a8b377b600f44102cad613a71fdd2b Mon Sep 17 00:00:00 2001
-From: Boris Ranto <branto@redhat.com>
-Date: Fri, 6 Oct 2017 12:22:37 +0200
-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(+)
-
-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 @@
-   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
-+
-+- name: Make sure devel_mode is not on
-+  assert:
-+    that:
-+      - devel_mode == False
-+      - use_epel == False
-+    msg: "Devel mode is not supported in the downstream builds"
--- 
-2.9.5
-
diff --git a/cephmetrics.spec.in b/cephmetrics.spec.in
index 6120010..75db0b4 100644
--- a/cephmetrics.spec.in
+++ b/cephmetrics.spec.in
@@ -57,7 +57,7 @@ Ansible playbooks for Ceph metrics
 %prep
 %setup -q
 # Disable devel_mode in the rpms
-patch -p1 < 0001-ansible-Disable-devel_mode.patch
+patch -p1 < patches/0001-ansible-Disable-devel_mode.patch
 # Unzip grafana plugins
 unzip %SOURCE1
 mv -f Vonage* cephmetrics-vonage
diff --git a/patches/0001-ansible-Disable-devel_mode.patch b/patches/0001-ansible-Disable-devel_mode.patch
new file mode 100644
index 0000000..5ddfac0
--- /dev/null
+++ b/patches/0001-ansible-Disable-devel_mode.patch
@@ -0,0 +1,28 @@
+From 49ffd15645a8b377b600f44102cad613a71fdd2b Mon Sep 17 00:00:00 2001
+From: Boris Ranto <branto@redhat.com>
+Date: Fri, 6 Oct 2017 12:22:37 +0200
+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(+)
+
+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 @@
+   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
++
++- name: Make sure devel_mode is not on
++  assert:
++    that:
++      - devel_mode == False
++      - use_epel == False
++    msg: "Devel mode is not supported in the downstream builds"
+-- 
+2.9.5
+