Merge pull request #2065 from ceph/rhcs-rm

[skip ci] rpm: remove ability to install ceph community version
2017-10-17 17:05:14 +02:00 · 2017-10-17 17:05:14 +02:00 · 897136b368
parent 013bc6454f c72ddee2d9
commit 897136b368
1 changed files with 2 additions and 0 deletions
--- a/ceph-ansible.spec.in
+++ b/ceph-ansible.spec.in
@ -46,6 +46,8 @@ pushd %{buildroot}%{_datarootdir}/ceph-ansible
  # These untested playbooks are too unstable for users.
  rm -r infrastructure-playbooks/untested-by-ci
  %if ! 0%{?fedora} && ! 0%{?centos}
+    # remove ability to install ceph community version
+    rm roles/ceph-common/tasks/installs/redhat_{community,custom,dev}_repository.yml
    # Ship only the Red Hat Ceph Storage config (overwrite upstream settings)
    cp group_vars/rhcs.yml.sample group_vars/all.yml.sample
  %endif