added parameters and settings.sh are now just defaults

diff --git a/attach b/attach
index 4168999..6018c5d 100755 (executable)
--- a/attach
+++ b/attach
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /usr/share/ganeti/extstorage/zfs/settings.sh
+. /usr/share/ganeti/extstorage/zfs/defaults.sh
 
 # Return path to new blockdevice
-echo -n /dev/zvol/$block/$VOL_NAME
+echo -n /dev/zvol/$EXTP_BLOCK/$VOL_NAME

diff --git a/create b/create
index a6c5cb1..ac011d1 100755 (executable)
--- a/create
+++ b/create
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. /usr/share/ganeti/extstorage/zfs/settings.sh
+. /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-zfs create -V ${VOL_SIZE}M $vol_param $block/$VOL_NAME
+zfs create -V ${VOL_SIZE}M $EXTP_VOL_PARAM $EXTP_BLOCK/$VOL_NAME

diff --git a/defaults.sh b/defaults.sh
new file mode 100644 (file)
index 0000000..7c44b7e
--- /dev/null
+++ b/defaults.sh
@@ -0,0 +1,6 @@
+
+# pool and path where to create block devices
+test -z "$EXTP_BLOCK" && EXTP_BLOCK=tmp500g/block
+
+# parameters for zfs create
+test -z "$EXTP_VOL_PARAM" && EXTP_VOL_PARAM="-s -b 4k -o compression=lz4"

diff --git a/detach b/detach
index 6a70038..6ae9249 100755 (executable)
--- a/detach
+++ b/detach
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. /usr/share/ganeti/extstorage/zfs/settings.sh
+. /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-#eject /dev/zvol/$block/$VOL_NAME
+#eject /dev/zvol/$EXTP_BLOCK/$VOL_NAME

diff --git a/grow b/grow
index 1f66e25..1553622 100755 (executable)
--- a/grow
+++ b/grow
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. /usr/share/ganeti/extstorage/zfs/settings.sh
+. /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-zfs set volsize=${NEW_VOL_SIZE}M $block/$VOL_NAME
+zfs set volsize=${NEW_VOL_SIZE}M $EXTP_BLOCK/$VOL_NAME

diff --git a/parameters.list b/parameters.list
new file mode 100644 (file)
index 0000000..6bad2e1
--- /dev/null
+++ b/parameters.list
@@ -0,0 +1,2 @@
+block  pool/block_path to use for zfs volumes
+vol_param      parameters to use for zfs create -V

diff --git a/remove b/remove
index 339fad9..52ea5c2 100755 (executable)
--- a/remove
+++ b/remove
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. /usr/share/ganeti/extstorage/zfs/settings.sh
+. /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-zfs destroy $block/$VOL_NAME
+zfs destroy $EXTP_BLOCK/$VOL_NAME

diff --git a/setinfo b/setinfo
index 590a71d..01c45e0 100755 (executable)
--- a/setinfo
+++ b/setinfo
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-. /usr/share/ganeti/extstorage/zfs/settings.sh
+. /usr/share/ganeti/extstorage/zfs/defaults.sh
 
-zfs set ganti:metadata="$VOL_METADATA" $block/$VOL_NAME
+zfs set ganti:metadata="$VOL_METADATA" $EXTP_BLOCK/$VOL_NAME

diff --git a/settings.sh b/settings.sh
deleted file mode 100644 (file)
index 2396df2..0000000
--- a/settings.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# pool and path where to create block devices
-block=tmp500g/block
-
-# parameters for zfs create
-vol_param="-s -b 4k -o compression=lz4"