rpm: do not package iscsi files

Currently we cannot install the ceph-iscsi-ansible RPM on a node where
the ceph-ansible RPM is already installed.

ceph-iscsi-ansible should install on top of the ceph-ansible environment
without issues.

diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in
index d8947f858024582665559676c031a42fdcb6ff8e..a1408e3bdc665cb6e713f4613c570fc7fda62c2d 100644 (file)
--- a/ceph-ansible.spec.in
+++ b/ceph-ansible.spec.in
@@ -43,6 +43,13 @@ pushd %{buildroot}%{_datarootdir}/ceph-ansible
   rm group_vars/common-coreoss.yml.sample
 popd
 
+# Strip iscsi files.
+# These are just placeholders until ceph-iscsi-gw can merge into
+# ceph-ansible. (See https://bugzilla.redhat.com/1454945).
+pushd %{buildroot}%{_datarootdir}/ceph-ansible
+  rm -r roles/ceph-iscsi-gw
+popd
+
 %check
 # Borrowed from upstream's .travis.yml:
 ansible-playbook -i dummy-ansible-hosts test.yml --syntax-check