From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Wed, 23 Oct 2019 07:21:54 +0000 (+0200)
Subject: Merge branch 'master' of github.com:ffzg/gnt-info
X-Git-Url: http://git.rot13.org/?p=gnt-info;a=commitdiff_plain;h=e0d5442de4fbb98d3f2a890faab150ab00b8e0da;hp=e07f357e9a4fd7433becabdc268941a81b16263a

Merge branch 'master' of github.com:ffzg/gnt-info
---

diff --git a/gnt-lv-snap-rsync.sh b/gnt-lv-snap-rsync.sh
index 5b67844..f00b08f 100755
--- a/gnt-lv-snap-rsync.sh
+++ b/gnt-lv-snap-rsync.sh
@@ -60,7 +60,7 @@ __SHELL__
 	ssh $node sh -xe /dev/shm/$instance.sh
 
 	# execute zfs snap on $rsync_server via ssh command="" wrapper
-	ssh -i /root/.ssh/id_dsa-zfs $rsync_server $rsync_server/$backup/$instance/$disk_nr
+	ssh -i /etc/ganeti/id_dsa-zfs-snap $rsync_server $rsync_server/$backup/$instance/$disk_nr
 done
 
 if [ $found_lvm = 0 ] ; then
diff --git a/rbd-snap-backup.sh b/rbd-snap-backup.sh
index 2948e3f..0f82bb1 100755
--- a/rbd-snap-backup.sh
+++ b/rbd-snap-backup.sh
@@ -37,7 +37,7 @@ fi
 
 rsync -ravHzXA --inplace --numeric-ids --delete $rsync_args \
 	/dev/shm/$rbd_image.snap/ $rsync_host::$backup/$instance/$disk/ \
-&& ssh -i /root/.ssh/id_dsa-zfs $rsync_host $rsync_host/$backup/$instance/$disk
+&& ssh -i /etc/ganeti/id_dsa-zfs-snap $rsync_host $rsync_host/$backup/$instance/$disk
 
 # XXX backup OK