Test-enable XIO messenger and IB/RDMA support

Fixes: http://tracker.ceph.com/issues/15472
Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/ceph.spec.in b/ceph.spec.in
index 055185b2a174a1d8833d0df656fc5898a2918362..4d850ff136ac65c1cb129d7c65d9527f52be4f17 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -17,6 +17,7 @@
 %bcond_with ocf
 %bcond_without cephfs_java
 %bcond_with tests
+%bcond_with xio
 %bcond_without tcmalloc
 %bcond_without libs_compat
 %bcond_with lowmem_builder
@@ -177,6 +178,10 @@ BuildRequires:     fcgi-devel
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:  redhat-rpm-config
 %endif
+# Accelio IB/RDMA
+%if 0%{with xio}
+BuildRequires:  libxio-devel
+%endif
 
 %description
 Ceph is a massively scalable, open-source, distributed storage system that runs
@@ -216,6 +221,9 @@ Recommends:    ntp-daemon
 %if 0%{?fedora} || 0%{?rhel}
 Requires:      redhat-lsb-core
 %endif
+%if 0%{with xio}
+Requires:      libxio
+%endif
 %description base
 Base is the package that includes all the files shared amongst ceph servers
 
@@ -233,6 +241,9 @@ Requires:   python-requests
 %if 0%{?suse_version}
 Requires(pre): pwdutils
 %endif
+%if 0%{with xio}
+Requires:       libxio
+%endif
 %description -n ceph-common
 Common utilities to mount and interact with a ceph storage cluster.
 Comprised of files that are common to Ceph clients and servers.
@@ -646,6 +657,9 @@ export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/i386/i486/'`
 %if 0%{with cephfs_java}
                --enable-cephfs-java \
 %endif
+%if 0%{with xio}
+               --enable-xio \
+%endif
 %if 0%{with selinux}
                --with-selinux \
 %endif