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

[sysadmin-cookbook] / recepies / ganeti / migrate-lxc / D-ganeti-create-instance.sh

diff --git a/recepies/ganeti/migrate-lxc/D-ganeti-create-instance.sh b/recepies/ganeti/migrate-lxc/D-ganeti-create-instance.sh
index 7a52ec5..8507a6b 100755 (executable)
--- a/recepies/ganeti/migrate-lxc/D-ganeti-create-instance.sh
+++ b/recepies/ganeti/migrate-lxc/D-ganeti-create-instance.sh
@@ -4,9 +4,9 @@
 . ./0-lxc.sh
 . ./0-ganeti.sh
 
-ssh_master umount /tmp/$host
+ssh_storage umount /tmp/$host
 
-ssh_master dmsetup remove ffzgvg-${host}p1
+ssh_storage dmsetup remove ffzgvg-${hostlv}p1
 
-ssh_master gnt-instance add -H kvm:kernel_path=/boot/vmlinuz-3.2-kvmU,initrd_path=/boot/initrd.img-3.2-kvmU -B maxmem=1G,minmem=1G,vcpus=2 -t plain -n vmh12 -o debootstrap+default --disk 0:adopt=$host --disk 1:adopt=$host-swap --no-start --no-ip-check --no-name-check $host_fqdn
+ssh_master gnt-instance add -H kvm:kernel_path=/boot/vmlinuz-3.2-kvmU,initrd_path=/boot/initrd.img-3.2-kvmU -B maxmem=1G,minmem=1G,vcpus=2 -t plain -n $storage_node -o debootstrap+default --disk 0:adopt=$host --disk 1:adopt=$host-swap --no-start --no-ip-check --no-name-check $host_fqdn