diff options
author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-01-06 10:37:54 -0500 |
---|---|---|
committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2017-01-17 16:53:30 -0800 |
commit | c822e354e16646adf18bbc5123798663faa543b2 (patch) | |
tree | f22b87c6711639135f991293f5c406f06466ec92 /glusterfs.spec.in | |
parent | 7b61434257f68749bfceee481fa505de7f945747 (diff) |
storhaug HA: first step, remove resource agents and setup script
resource agents and setup script(s) are now in storhaug
This is a phased switch-over to storhaug. Ultimately all components
here should be (re)moved to the storhaug project and its packages.
But for now some will linger here.
Change-Id: Ied3956972b14b14d8a76e22c583b1fe25869f8e7
BUG: 1410843
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/16349
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Diffstat (limited to 'glusterfs.spec.in')
-rw-r--r-- | glusterfs.spec.in | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index c86bbcf1b19..9483911895b 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -376,15 +376,8 @@ Summary: NFS-Ganesha configuration Group: Applications/File Requires: %{name}-server%{?_isa} = %{version}-%{release} -Requires: nfs-ganesha-gluster >= 2.4.0 -Requires: pcs, dbus -%if ( 0%{?rhel} && 0%{?rhel} == 6 ) -Requires: cman, pacemaker, corosync -%endif -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 ) -# we need portblock resource-agent in 3.9.5 and later. -Requires: resource-agents >= 3.9.5 -%endif +Requires: nfs-ganesha-gluster >= 2.4.1 +Requires: dbus %description ganesha GlusterFS is a distributed file-system capable of scaling to several @@ -1053,7 +1046,6 @@ exit 0 %files ganesha %{_sysconfdir}/ganesha/* %{_libexecdir}/ganesha/* -%{_prefix}/lib/ocf/resource.d/heartbeat/* %{_sharedstatedir}/glusterd/hooks/1/start/post/S31ganesha-start.sh %if ( 0%{!?_without_georeplication:1} ) @@ -1267,6 +1259,9 @@ exit 0 %endif %changelog +* Fri Jan 13 2017 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- switch to storhaug HA + * Fri Jan 6 2017 Niels de Vos <ndevos@redhat.com> - use macro provided by firewalld-filesystem to reload firewalld |