From 1bdd933afefe2fabaec901eae221be841945e736 Mon Sep 17 00:00:00 2001 From: Boris Ranto Date: Thu, 5 Oct 2017 22:39:17 +0200 Subject: [PATCH] ansible: Disable devel_mode Signed-off-by: Boris Ranto --- 0001-ansible-Disable-devel_mode.patch | 28 +++++++++++++++++++++++++++ cephmetrics.spec.in | 3 +++ 2 files changed, 31 insertions(+) create mode 100644 0001-ansible-Disable-devel_mode.patch diff --git a/0001-ansible-Disable-devel_mode.patch b/0001-ansible-Disable-devel_mode.patch new file mode 100644 index 0000000..5ddfac0 --- /dev/null +++ b/0001-ansible-Disable-devel_mode.patch @@ -0,0 +1,28 @@ +From 49ffd15645a8b377b600f44102cad613a71fdd2b Mon Sep 17 00:00:00 2001 +From: Boris Ranto +Date: Fri, 6 Oct 2017 12:22:37 +0200 +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(+) + +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 bca3ccd..328d380 100644 --- a/cephmetrics.spec.in +++ b/cephmetrics.spec.in @@ -55,6 +55,9 @@ Ansible playbooks for Ceph metrics %prep %setup -q +# Disable devel_mode in the rpms +patch -p1 < 0001-ansible-Disable-devel_mode.patch +# Unzip grafana plugins unzip %SOURCE1 mv -f Vonage* cephmetrics-vonage unzip %SOURCE2 -- 2.47.3