diff options
| author | Kaleb S. KEITHLEY <kkeithle@redhat.com> | 2017-02-20 12:00:02 -0500 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2017-02-20 18:21:27 -0500 |
| commit | 142ee0c200f1fbb727c6f58daf2352f69e07c029 (patch) | |
| tree | 0987c8cb1ef33a432d3dc2c26a1b99baebed1036 /glusterfs.spec.in | |
| parent | 6cf59d308371715704b397c851683490a897da8c (diff) | |
common-ha: revert switch to storhaug
we'll try again for 3.11.
Change-Id: Ib4c50414dc3d16a23dc7a49020445129da55843c
BUG: 1410843
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: https://review.gluster.org/16692
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>
Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com>
Diffstat (limited to 'glusterfs.spec.in')
| -rw-r--r-- | glusterfs.spec.in | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 2870d26a513..e3ffbb2cc3c 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -375,7 +375,14 @@ Group: Applications/File Requires: %{name}-server%{?_isa} = %{version}-%{release} Requires: nfs-ganesha-gluster >= 2.4.1 -Requires: dbus +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 %description ganesha GlusterFS is a distributed file-system capable of scaling to several @@ -1055,6 +1062,7 @@ 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} ) @@ -1261,6 +1269,9 @@ exit 0 %endif %changelog +* Mon Feb 20 2017 Kaleb S. KEITHLEY <kkeithle@redhat.com> +- revert switch to storhaug HA + * Wed Feb 1 2017 Poornima G <pgurusid@redhat.com> - Install /var/lib/glusterd/groups/metadata-cache by default |