Merge pull request #1895 from ceph/rhcs-on-rhel

rpm: ship different yml samples on RHEL vs CentOS
pull/1899/head
Sébastien Han 2017-09-14 13:44:05 -06:00 committed by GitHub
commit 3321b9359b
1 changed files with 7 additions and 0 deletions

View File

@ -44,6 +44,13 @@ pushd %{buildroot}%{_datarootdir}/ceph-ansible
rm group_vars/common-coreoss.yml.sample rm group_vars/common-coreoss.yml.sample
# These untested playbooks are too unstable for users. # These untested playbooks are too unstable for users.
rm -r infrastructure-playbooks/untested-by-ci 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 popd
%check %check