split master and storage node, support machines with dash in name

[sysadmin-cookbook] / recepies / ganeti / migrate-lxc / 3-ganeti-root-lvm.sh

diff --git a/recepies/ganeti/migrate-lxc/3-ganeti-root-lvm.sh b/recepies/ganeti/migrate-lxc/3-ganeti-root-lvm.sh
index ef2a995..ac6b97b 100755 (executable)
--- a/recepies/ganeti/migrate-lxc/3-ganeti-root-lvm.sh
+++ b/recepies/ganeti/migrate-lxc/3-ganeti-root-lvm.sh
@@ -3,14 +3,13 @@
 . ./0-host.sh
 . ./0-ganeti.sh
 
+ssh_storage lvcreate --size `cat $host/size` --name $host ffzgvg
+ssh_storage lvextend --size 4G /dev/mapper/ffzgvg-$hostlv
 
-ssh_master lvcreate --size `cat $host/size` --name $host ffzgvg
-ssh_master lvextend --size 4G /dev/mapper/ffzgvg-$host
+ssh_storage parted -s /dev/mapper/ffzgvg-$hostlv 'mklabel msdos mkpart primary 0% 100% set 1 boot on'
 
-ssh_master parted -s /dev/mapper/ffzgvg-$host 'mklabel msdos mkpart primary 0% 100% set 1 boot on'
+ssh_storage mkfs.ext4 -L root /dev/mapper/ffzgvg-${hostlv}p1
 
-ssh_master mkfs.ext4 -L root /dev/mapper/ffzgvg-${host}p1
-
-ssh_master mkdir /tmp/$host
-ssh_master mount /dev/mapper/ffzgvg-${host}p1 /tmp/$host
-ssh_master df -h /tmp/$host
+ssh_storage mkdir /tmp/$host
+ssh_storage mount /dev/mapper/ffzgvg-${hostlv}p1 /tmp/$host
+ssh_storage df -h /tmp/$host