]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rpm: remove ability to install ceph community version 2069/head
authorSébastien Han <seb@redhat.com>
Tue, 17 Oct 2017 09:49:41 +0000 (11:49 +0200)
committerSébastien Han <seb@redhat.com>
Tue, 17 Oct 2017 15:07:27 +0000 (17:07 +0200)
Downstream version of ceph-ansible could still trigger install from
upstream repo and import keys.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1503019
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit c72ddee2d9e93e72722004b109733a68ffd6b8d1)
Signed-off-by: Sébastien Han <seb@redhat.com>
ceph-ansible.spec.in

index e319f8c8384762fa786f88e527d737ba5b5a3e14..0171f6ea6cffc65d0346dd1f15c6bd957da92513 100644 (file)
@@ -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