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

[gnt-info] / rbd-snap-backup.sh

diff --git a/rbd-snap-backup.sh b/rbd-snap-backup.sh
index 8032f9d..0f82bb1 100755 (executable)
--- a/rbd-snap-backup.sh
+++ b/rbd-snap-backup.sh
@@ -7,6 +7,8 @@ disk=$2
 test -z "$backup" && backup="backup"
 test -z "$rsync_host" && rsync_host="lib15"
 
+test "`rsync $rsync_host::$backup/$instance/$disk 2>/dev/null | wc -l`" != 1 && echo "ERROR $rsync_host::$backup/$instance/$disk backup target missing" && exit 1
+
 rbd_image=`gnt-instance info --static $instance | grep logical_id: | cut -d\' -f4 | grep "\.rbd\.disk$disk\$"`
 
 test -z "$rbd_image" && echo "can't find rbd_image name for $instance $disk" && exit 1
@@ -35,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