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

[sysadmin-cookbook] / recepies / ganeti / migrate-lxc / A-ganeti-fix-root.sh

diff --git a/recepies/ganeti/migrate-lxc/A-ganeti-fix-root.sh b/recepies/ganeti/migrate-lxc/A-ganeti-fix-root.sh
index 2c4c4ae..7961bdc 100755 (executable)
--- a/recepies/ganeti/migrate-lxc/A-ganeti-fix-root.sh
+++ b/recepies/ganeti/migrate-lxc/A-ganeti-fix-root.sh
@@ -3,15 +3,15 @@
 . ./0-host.sh
 . ./0-ganeti.sh
 
-ssh_master ls -d /tmp/$host/rootfs > $host/rootfs_boot
+ssh_storage ls -d /tmp/$host/rootfs > $host/rootfs_boot
 if [ -s $host/rootfs_boot ] ; then
-       ssh_master mv /tmp/$host/rootfs/* /tmp/$host/
-       ssh_master mv /tmp/$host/rootfs/.?* /tmp/$host/
-       ssh_master rmdir /tmp/$host/rootfs
+       ssh_storage mv /tmp/$host/rootfs/* /tmp/$host/
+       ssh_storage mv /tmp/$host/rootfs/.?* /tmp/$host/
+       ssh_storage rmdir /tmp/$host/rootfs
 fi
 
-ssh_master mkdir -p /tmp/$host/lib/modules
-ssh_master cp -ra /lib/modules/3.2.0-4-amd64 /tmp/$host/lib/modules
+ssh_storage mkdir -p /tmp/$host/lib/modules
+ssh_storage cp -ra /lib/modules/3.2.0-4-amd64 /tmp/$host/lib/modules
 
-ssh_master chroot /tmp/$host apt-get install --reinstall -y initscripts acpid
+ssh_storage chroot /tmp/$host apt-get install --reinstall -y initscripts acpid