Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/214377
Change subject: install-server: Accomodate virtualization
..
install-server: Accomodate virtualization
Make grub-installer/bootdev conditional based on the detection of
virtualization technology. The check is rather simple. Detect QEMU
enabled CPUs. This means the -cpu must not be passed to qemu-system
since it will mask the model name. Ganeti does not pass that argument
unless instructed to. We will reiterate on the check later on should the
need arise
Change-Id: I7a50cfabb74a1431225c4e6ac1e441eb95563204
---
M modules/install-server/files/autoinstall/common.cfg
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/flat-virtual.cfg
A modules/install-server/files/autoinstall/sda.cfg
A modules/install-server/files/autoinstall/vda.cfg
5 files changed, 42 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/77/214377/1
diff --git a/modules/install-server/files/autoinstall/common.cfg
b/modules/install-server/files/autoinstall/common.cfg
index 7ddb838..7835f7d 100644
--- a/modules/install-server/files/autoinstall/common.cfg
+++ b/modules/install-server/files/autoinstall/common.cfg
@@ -19,7 +19,6 @@
d-igrub-installer/only_debian boolean true
d-igrub-installer/with_other_osboolean true
-d-igrub-installer/bootdev string /dev/sda
d-idebian-installer/add-kernel-optsstring elevator=deadline
d-igrub-pc grub-pc/hidden_timeout boolean false
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 338666e..a8cf4cb 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -68,7 +68,7 @@
eeden|hooft|maerlant|multatuli|nescio) echo
partman/raid1-1partition.cfg ;; \
einsteinium) echo partman/raid1-lvm-ext4.cfg;; \
elastic10[0-2][0-9]|elastic103[0-1]) echo
partman/elasticsearch.cfg ;; \
- etherpad[12]001) echo partman/flat.cfg ;; \
+ etherpad[12]001) echo partman/flat-virtual.cfg ;; \
iodine) echo partman/raid1-1partition.cfg ;; \
# sodium) echo partman/mailserver.cfg ;; \
mc[1-9]*) echo partman/mc.cfg ;; \
@@ -105,4 +105,11 @@
wtp[1-2]0[0-2][0-9]|hafnium) echo partman/raid1-lvm.cfg ;; \
carbon|stat1003) echo partman/raid5-gpt-lvm.cfg ;; \
hydrogen|krypton) echo partman/raid1-1partition.cfg ;; \
- esac
+ esac; \
+ \
+ if $(grep -q 'QEMU Virtual CPU' /proc/cpuinfo) ; \
+then \
+ echo vda.cfg ; \
+ else \
+ echo sda.cfg ; \
+ fi
diff --git a/modules/install-server/files/autoinstall/partman/flat-virtual.cfg
b/modules/install-server/files/autoinstall/partman/flat-virtual.cfg
new file mode 100644
index 000..4b273bc
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/flat-virtual.cfg
@@ -0,0 +1,31 @@
+# Flat profile (single disk or HW RAID). Creates:
+# * no RAID (either single disk or hardware raid presenting a single device)
+# * no LVM
+# * 1G swap on the end of the disk
+# * the rest formatted with ext4 for /
+
+d-ipartman-auto/method string regular
+d-ipartman-auto/disk string /dev/vda
+
+d-ipartman-auto/expert_recipe string \
+ 1disk ::\
+ 500 1 100 ext4 \
+ $primary{ } \
+ $bootable{ }\
+ method{ format }\
+ format{ } \
+ use_filesystem{ } \
+ filesystem{ ext4 } \
+ mountpoint{ / } \
+ . \
+ 1024 1024 1024 linux-swap \
+ method{ swap } \
+ format{ } \
+ .
+
+d-ipartman-auto/choose_recipe 1disk
+
+d-ipartman/choose_partitionselect finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+d-ipartman/confirm_write_new_label boolean true
diff --git a/modules/install-server/files/autoinstall/sda.cfg
b/modules/install-server/files/autoinstall/sda.cfg
new file mode 100644
index 000..d1d8008
--- /dev/null
+++ b/modules/install-server/files/autoinstall/sda.cfg
@@ -0,0 +1 @@
+d-igrub-installer/bootdev string /dev/sda
diff
