Merge pull request #1586 from ceph/rpm-strip-iscsi

rpm: do not package iscsi files
2017-06-05 13:46:41 -05:00 · 2017-06-05 13:46:41 -05:00 · b7f3be6c35
parent 634bc588c2 2cfb3677d8
commit b7f3be6c35
1 changed files with 7 additions and 0 deletions
--- 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