working test raid setup

diff --git a/fai-redep b/fai-redep
index 8ff1df2c9b2f284b0c9e9900acf4c8e38835be5c..64368e420fab64767893b1970a66dae2b8995819 100755 (executable)
--- a/fai-redep
+++ b/fai-redep
@@ -23,4 +23,6 @@ s qemu-img create -o preallocation=metadata -f qcow2 \
 s qemu-img create -o preallocation=metadata -f qcow2 \
   /var/lib/libvirt/images/demohostb 30G
 # osinfo-query os | gr jessie
-s virt-install --os-variant debian8 --cpu host -n demohost --pxe -r 2048 --vcpus 1 --disk path=/var/lib/libvirt/images/demohost   -w bridge=br0,mac=52:54:00:9c:ef:ad
+s virt-install --os-variant debian8 --cpu host -n demohost --pxe -r 2048 --vcpus 1 \
+  --disk path=/var/lib/libvirt/images/demohost \
+  --disk path=/var/lib/libvirt/images/demohostb -w bridge=br0,mac=52:54:00:9c:ef:ad

diff --git a/fai/config/disk_config/VM b/fai/config/disk_config/VM
new file mode 100644 (file)
index 0000000..53c6527
--- /dev/null
+++ b/fai/config/disk_config/VM
@@ -0,0 +1,2 @@
+disk_config disk1 disklabel:gpt-bios bootable:1 fstabkey:uuid
+primary / 100% ext4 noatime,errors=remount-ro

diff --git a/fai/config/disk_config/demohost b/fai/config/disk_config/demohost
index 53c6527fb0af6f01e381f14d57da1b2292997018..38e0f6fd21c6e5ac918e4a3a6fee76f4ba967c96 100644 (file)
--- a/fai/config/disk_config/demohost
+++ b/fai/config/disk_config/demohost
@@ -1,2 +1,11 @@
-disk_config disk1 disklabel:gpt-bios bootable:1 fstabkey:uuid
-primary / 100% ext4 noatime,errors=remount-ro
+disk_config vda
+primary   -          20GiB   -      -
+primary   -           4GiB   -      -
+
+disk_config vdb
+primary   -          20GiB   -      -
+primary   -           4GiB   -      -
+
+disk_config raid
+raid1     /      vda1,vdb1   ext3   rw
+raid1     swap   vda2,vdb2   swap   sw

diff --git a/fai/config/package_config/DEBIAN b/fai/config/package_config/DEBIAN
index 253e89c19fff34a57ebe1f434df5932af1054aa4..99c4fa04068f926a23392d9802f58ddde160a96a 100644 (file)
--- a/fai/config/package_config/DEBIAN
+++ b/fai/config/package_config/DEBIAN
@@ -14,7 +14,7 @@ PACKAGES install DHCPC
 isc-dhcp-client
 
 PACKAGES install GRUB_PC
-grub-pc grub-legacy- lilo-
+grub-pc mdadm grub-legacy- lilo-
 
 PACKAGES install LVM
 lvm2