added "install it" target

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

diff --git a/gnt-lv-snap-rsync.sh b/gnt-lv-snap-rsync.sh
index 9928924..4fbc415 100755 (executable)
--- a/gnt-lv-snap-rsync.sh
+++ b/gnt-lv-snap-rsync.sh
@@ -3,6 +3,7 @@
 instance=$1
 disk=$2
 test -z "$backup" && backup="backup"
+test -z "$rsync_server" && rsync_server="lib15"
 
 if [ "$1" = '-' ] ; then
        read instance disk
@@ -18,18 +19,16 @@ instance=`gnt-instance list --no-headers -o name $instance | head -1`
 node=`gnt-instance list -o pnode --no-headers $instance`
 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
+ssh $node lvs -o name,tags,vg_name | grep $instance | tee /dev/shm/$instace.$node.lvs | grep disk${disk}_data | while read lv origin vg ; 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 2>/dev/null; then
+       if rsync $rsync_server::$backup/$instance/rsync.args /dev/shm/$instance-rsync.args 2>/dev/null; then
                rsync_args="`cat /dev/shm/$instance-rsync.args`"
        fi
 
@@ -44,7 +43,7 @@ cat <<__SHELL__ > /dev/shm/$instance.sh
        test ! -z "\$offset" && offset=",offset=\$offset"
        mount /dev/$vg/$lv.snap /dev/shm/$lv.snap -o noatime\$offset
 
-       rsync -ravHzXA --inplace --numeric-ids --delete $rsync_args /dev/shm/$lv.snap/ lib15::$backup/$instance/$disk_nr/
+       rsync -ravHzXA --inplace --numeric-ids --delete $rsync_args /dev/shm/$lv.snap/ $rsync_server::$backup/$instance/$disk_nr/
 
        umount /dev/shm/$lv.snap
 
@@ -58,8 +57,8 @@ __SHELL__
 
        ssh $node sh -xe /dev/shm/$instance.sh
 
-       # execute zfs snap on lib15 via ssh command="" wrapper
-       ssh -i /etc/ganeti/id_dsa-zfs-snap lib15 lib15/$backup/$instance/$disk_nr
+       # execute zfs snap on $rsync_server via ssh command="" wrapper
+       ssh -i /etc/ganeti/id_dsa-zfs-snap $rsync_server $rsync_server/$backup/$instance/$disk_nr
 done
 
 if [ $found_lvm = 0 ] ; then