change location of zfs snap key

[gnt-info] / gnt-lv-snap-rsync.sh

diff --git a/gnt-lv-snap-rsync.sh b/gnt-lv-snap-rsync.sh
index b3e52fc..9928924 100755 (executable)
--- a/gnt-lv-snap-rsync.sh
+++ b/gnt-lv-snap-rsync.sh
@@ -20,12 +20,16 @@ echo "# $instance on $node"
 
 vg=`gnt-cluster info | grep 'lvm volume group:' | cut -d: -f2 | tr -d ' '`
 
+found_lvm=0
+
 ssh $node lvs -o name,tags | grep $instance | tee /dev/shm/$instace.$node.lvs | grep disk${disk}_data | while read lv origin ; do
+       found_lvm=1
+
        disk_nr=`echo $lv | cut -d. -f2 | tr -d a-z_`
        echo "# $lv | $origin | $disk_nr"
 
        rsync_args=""
-       if rsync lib15::$backup/$instance/rsync.args /dev/shm/$instance-rsync.args ; then
+       if rsync lib15::$backup/$instance/rsync.args /dev/shm/$instance-rsync.args 2>/dev/null; then
                rsync_args="`cat /dev/shm/$instance-rsync.args`"
        fi
 
@@ -55,7 +59,10 @@ __SHELL__
        ssh $node sh -xe /dev/shm/$instance.sh
 
        # execute zfs snap on lib15 via ssh command="" wrapper
-       ssh -i /root/.ssh/id_dsa-zfs lib15 lib15/$backup/$instance/$disk_nr
+       ssh -i /etc/ganeti/id_dsa-zfs-snap lib15 lib15/$backup/$instance/$disk_nr
 done
 
-
+if [ $found_lvm = 0 ] ; then
+       export backup
+       /srv/gnt-info/rbd-snap-backup.sh $instance $disk
+fi