ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1900 from ceph/rpm-all-yaml 

rpm: ship rhcs.yaml.sample as all.yml.sample on RHEL
pull/1865/merge
Sébastien Han 2017-09-18 14:52:11 +02:00 committed by GitHub
parent 7fedc8ebf4 cf945d5ac8
commit 1b468176b7
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceph-ansible.spec.in
View File

@ -45,12 +45,9 @@ 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
%if ! 0%{?fedora} && ! 0%{?centos}
# Ship only the Red Hat Ceph Storage config (overwrite upstream settings)
cp group_vars/rhcs.yml.sample group_vars/all.yml.sample
%endif
popd