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

rpm: ship rhcs.yaml.sample as all.yml.sample on RHEL 

When building the RPM on RHEL, we will ship the conents of the
`rhcs.yml.sample` file into `all.yml.sample`.

The purpose of this change is to expose "all.yml.sample" to both
upstream and downstream users, so they use the same file name (but with
different contents.)
pull/1900/head
Ken Dreyer 2017-09-14 14:42:53 -06:00
parent 3321b9359b
commit cf945d5ac8
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

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