From 93bd78eee97dab794fa6e9871d3c6b0fb1b97413 Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Thu, 14 Sep 2017 11:22:37 -0600 Subject: [PATCH] rpm: ship different yml samples on RHEL vs CentOS When building the RPM on CentOS, we will ship the all.yml.sample file and delete rhcs.yml.sample. When building the RPM on RHEL, we will ship the rhcs.yml.sample file and delete all.yml.sample. --- ceph-ansible.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in index 0baee0390..d56a96a4e 100644 --- a/ceph-ansible.spec.in +++ b/ceph-ansible.spec.in @@ -44,6 +44,13 @@ pushd %{buildroot}%{_datarootdir}/ceph-ansible rm group_vars/common-coreoss.yml.sample # These untested playbooks are too unstable for users. rm -r infrastructure-playbooks/untested-by-ci + %if 0%{?fedora} || 0%{?centos} + # Ship the upstream config (delete RHCS) + rm group_vars/rhcs.yml.sample + %else + # Ship only the Red Hat Ceph Storage config (delete upstream) + rm group_vars/all.yml.sample + %endif popd %check