Put OCF resource agents in a separate subpackage,
to be enabled with a separate build conditional
(--with ocf).
Make the subpackage depend on the resource-agents
package, which provides the ocf-shellfuncs library
that the Ceph RAs use.
Signed-off-by: Florian Haas <flor...@hastexo.com>
---
ceph.spec.in | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/ceph.spec.in b/ceph.spec.in
index b0f3c3a..3950fd1 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -1,5 +1,6 @@
%define with_gtk2 %{?_with_gtk2: 1} %{!?_with_gtk2: 0}
+%bcond_with ocf
# it seems there is no usable tcmalloc rpm for x86_64; parts of
# google-perftools don't compile on x86_64, and apparently the
# decision was to not build the package at all, even if tcmalloc
@@ -130,6 +131,19 @@ gcephtool is a graphical monitor for the clusters running
the Ceph distributed
file system.
%endif
+%if %{with ocf}
+%package resource-agents
+Summary: OCF-compliant resource agents for Ceph daemons
+Group: System Environment/Base
+License: LGPLv2
+Requires: %{name} = %{version}
+Requires: resource-agents
+%description resource-agents
+Resource agents for monitoring and managing Ceph daemons
+under Open Cluster Framework (OCF) compliant resource
+managers such as Pacemaker.
+%endif
+
%package -n librados2
Summary: RADOS distributed object store client library
Group: System Environment/Libraries
@@ -211,6 +225,7 @@ MY_CONF_OPT="$MY_CONF_OPT --without-gtk2"
--docdir=%{_docdir}/ceph \
--without-hadoop \
$MY_CONF_OPT \
+ %{?_with_ocf} \
%{?with_tcmalloc:--with-tcmalloc}
%{!?with_tcmalloc:--without-tcmalloc}
# fix bug in specific version of libedit-devel
@@ -415,6 +430,13 @@ fi
%endif
#################################################################################
+%if %{with ocf}
+%files resource-agents
+%defattr(0755,root,root,-)
+/usr/lib/ocf/resource.d/%{name}/*
+%endif
+
+#################################################################################
%files -n librados2
%defattr(-,root,root,-)
%{_libdir}/librados.so.*
--
1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
