mirror of https://github.com/ceph/ceph-ansible.git
Merge pull request #1895 from ceph/rhcs-on-rhel
rpm: ship different yml samples on RHEL vs CentOSpull/1899/head
commit
3321b9359b
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue