From 2cfb3677d8fc5d960e4a7a0f5ec753f99d80d12a Mon Sep 17 00:00:00 2001 From: Ken Dreyer Date: Mon, 5 Jun 2017 09:17:59 -0600 Subject: [PATCH] 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. --- ceph-ansible.spec.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ceph-ansible.spec.in b/ceph-ansible.spec.in index d8947f858..a1408e3bd 100644 --- 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 -- 2.39.5