diff options
| author | Aravinda VK <avishwan@redhat.com> | 2014-02-06 17:48:19 +0530 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-02-10 18:29:27 -0800 |
| commit | fbf509dddf0745d360fe560a99dc593c542cfe61 (patch) | |
| tree | 00e80c45ce77e7a9f8b35ed88e7661798c454d92 | |
| parent | 8014bf281294e155dfbc7041cfef5151ae4f19e5 (diff) | |
spec: geo-rep: Include hooks and upgrade scripts
Added hook script S56glusterd-geo-rep-create-post.sh to
%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/ and upgrade
scripts added to %{_datadir}/glusterfs/scripts/
BUG: 1036539
Change-Id: I53f6984671feecbc2890fed59d8fc7f4545c50a3
Reviewed-on: http://review.gluster.org/6926
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Reviewed-on: http://review.gluster.org/6927
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | extras/geo-rep/Makefile.am | 9 | ||||
| -rw-r--r-- | glusterfs.spec.in | 20 |
2 files changed, 29 insertions, 0 deletions
diff --git a/extras/geo-rep/Makefile.am b/extras/geo-rep/Makefile.am index fc5f56d54fa..9435861cf97 100644 --- a/extras/geo-rep/Makefile.am +++ b/extras/geo-rep/Makefile.am @@ -1,2 +1,11 @@ +scriptsdir = $(datadir)/glusterfs/scripts +scripts_DATA = gsync-upgrade.sh generate-gfid-file.sh get-gfid.sh \ + slave-upgrade.sh + +scripts_PROGRAMS = gsync-sync-gfid +gsync_sync_gfid_CFLAGS = $(GF_CFLAGS) -Wall -I$(top_srcdir)/libglusterfs/src +gsync_sync_gfid_LDADD = $(GF_LIBS) $(top_builddir)/libglusterfs/src/libglusterfs.la +gsync_sync_gfid_SOURCES = gsync-sync-gfid.c + EXTRA_DIST = gsync-sync-gfid.c gsync-upgrade.sh generate-gfid-file.sh \ get-gfid.sh slave-upgrade.sh diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 516ca513f19..16ff50a7bee 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -154,6 +154,9 @@ BuildRequires: lvm2-devel %if ( 0%{!?_without_qemu_block:1} ) BuildRequires: glib2-devel %endif +%if ( 0%{!?_without_georeplication:1} ) +BuildRequires: libattr-devel +%endif Obsoletes: hekafs Obsoletes: %{name}-common < %{version}-%{release} @@ -610,6 +613,9 @@ mkdir -p %{buildroot}%{_sharedstatedir}/glusterd/nfs/run touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid +install -p -m 0744 extras/hook-scripts/S56glusterd-geo-rep-create-post.sh \ + %{buildroot}%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post + find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs %clean @@ -690,12 +696,23 @@ if [ $1 -ge 1 ]; then fi %files geo-replication +%{_sysconfdir}/logrotate.d/glusterfs-georep %{_libexecdir}/glusterfs/gsyncd %{_libexecdir}/glusterfs/python/syncdaemon/* %{_libexecdir}/glusterfs/gverify.sh %{_libexecdir}/glusterfs/peer_add_secret_pub %{_libexecdir}/glusterfs/peer_gsec_create %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/geo-replication +%dir %{_sharedstatedir}/glusterd/hooks +%dir %{_sharedstatedir}/glusterd/hooks/1 +%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create +%dir %{_sharedstatedir}/glusterd/hooks/1/gsync-create/post +%{_sharedstatedir}/glusterd/hooks/1/gsync-create/post/S56glusterd-geo-rep-create-post.sh +%{_datadir}/glusterfs/scripts/get-gfid.sh +%{_datadir}/glusterfs/scripts/slave-upgrade.sh +%{_datadir}/glusterfs/scripts/gsync-upgrade.sh +%{_datadir}/glusterfs/scripts/generate-gfid-file.sh +%{_datadir}/glusterfs/scripts/gsync-sync-gfid %ghost %attr(0644,-,-) %{_sharedstatedir}/glusterd/geo-replication/gsyncd_template.conf %endif @@ -872,6 +889,9 @@ if [ $1 -ge 1 ]; then fi %changelog +* Thu Feb 06 2014 Aravinda VK <avishwan@redhat.com> +- Include geo-replication upgrade scripts and hook scripts. + * Sat Jan 4 2014 Niels de Vos <ndevos@redhat.com> - The main glusterfs package should not provide glusterfs-libs (#1048489) |