rename block param to zfs

diff --git a/attach b/attach
index 6018c5d..e4614cb 100755 (executable)
--- a/attach
+++ b/attach
@@ -3,4 +3,4 @@
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 # Return path to new blockdevice
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 # Return path to new blockdevice

-echo -n /dev/zvol/$EXTP_BLOCK/$VOL_NAME
+echo -n /dev/zvol/$EXTP_ZFS/$VOL_NAME

diff --git a/create b/create
index ac011d1..dffb10b 100755 (executable)
--- a/create
+++ b/create
@@ -2,4 +2,4 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 

-zfs create -V ${VOL_SIZE}M $EXTP_VOL_PARAM $EXTP_BLOCK/$VOL_NAME
+zfs create -V ${VOL_SIZE}M $EXTP_VOL_PARAM $EXTP_ZFS/$VOL_NAME

diff --git a/defaults.sh b/defaults.sh
index 28c3173..670d57f 100644 (file)
--- a/defaults.sh
+++ b/defaults.sh
@@ -1,6 +1,6 @@
 
 # zfs pool and file system (existing) where to create block devices
 
 # zfs pool and file system (existing) where to create block devices

-test -z "$EXTP_BLOCK" && EXTP_BLOCK=tmp500g/block
+test -z "$EXTP_ZFS" && EXTP_ZFS=tmp500g/block

 
 # parameters for zfs create, by default
 # -s   sparse
 
 # parameters for zfs create, by default
 # -s   sparse

diff --git a/detach b/detach
index 6ae9249..3e90050 100755 (executable)
--- a/detach
+++ b/detach
@@ -2,4 +2,4 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 

-#eject /dev/zvol/$EXTP_BLOCK/$VOL_NAME
+#eject /dev/zvol/$EXTP_ZFS/$VOL_NAME

diff --git a/grow b/grow
index 1553622..949848c 100755 (executable)
--- a/grow
+++ b/grow
@@ -2,4 +2,4 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 

-zfs set volsize=${NEW_VOL_SIZE}M $EXTP_BLOCK/$VOL_NAME
+zfs set volsize=${NEW_VOL_SIZE}M $EXTP_ZFS/$VOL_NAME

diff --git a/parameters.list b/parameters.list
index 6bad2e1..334acae 100644 (file)
--- a/parameters.list
+++ b/parameters.list
@@ -1,2 +1,2 @@
-block  pool/block_path to use for zfs volumes
+zfs    where to create instance zfs volumes

 vol_param      parameters to use for zfs create -V
 vol_param      parameters to use for zfs create -V

diff --git a/remove b/remove
index 52ea5c2..ec17ce5 100755 (executable)
--- a/remove
+++ b/remove
@@ -2,4 +2,4 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 

-zfs destroy $EXTP_BLOCK/$VOL_NAME
+zfs destroy $EXTP_ZFS/$VOL_NAME

diff --git a/setinfo b/setinfo
index 6d2fab2..ef1d71b 100755 (executable)
--- a/setinfo
+++ b/setinfo
@@ -2,4 +2,4 @@
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 
 . /usr/share/ganeti/extstorage/zfs/defaults.sh
 

-zfs set ganeti:metadata="$VOL_METADATA" $EXTP_BLOCK/$VOL_NAME
+zfs set ganeti:metadata="$VOL_METADATA" $EXTP_ZFS/$VOL_NAME