From: Ken Dreyer <kdreyer@redhat.com>
Date: Thu, 14 Sep 2017 17:22:37 +0000 (-0600)
Subject: rpm: ship different yml samples on RHEL vs CentOS
X-Git-Tag: v3.0.0rc9~7^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=93bd78eee97dab794fa6e9871d3c6b0fb1b97413;p=ceph-ansible.git

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.
---

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