added ele-thetys and support for UEFI in preseed

8 files changed, 57 insertions, 116 deletions

diff --git a/common/usb-install.yml b/common/usb-install.yml
index 2964fac7..1e5a7827 100644
--- a/common/usb-install.yml
+++ b/common/usb-install.yml
@@ -83,7 +83,8 @@
 
               for UEFI these steps need to be done
 
+              $ sudo apt install syslinux-efi
               $ cp /usr/lib/syslinux/modules/efi64/* {{ usbdrive_path }}/EFI/boot/
-              $ cp /usr/lib/SYSLINUX.EFI/efi64/syslinux.efi {{ usbdrive_path }}/EFI/boot/
+              $ cp /usr/lib/SYSLINUX.EFI/efi64/syslinux.efi {{ usbdrive_path }}/EFI/boot/bootx64.efi
 
               This will NOT be done automatically.
diff --git a/inventory/group_vars/elevate-festival/main.yml b/inventory/group_vars/elevate-festival/main.yml
index dd047878..2f12dfda 100644
--- a/inventory/group_vars/elevate-festival/main.yml
+++ b/inventory/group_vars/elevate-festival/main.yml
@@ -11,7 +11,8 @@ network_zones:
       limit: 199
     offsets:
       ele-media: 200
-      telesto: 201
+      ele-telesto: 201
+      ele-thetys: 202
 
   guest:
     vlan: 23
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
new file mode 100644
index 00000000..2f10c256
--- /dev/null
+++ b/inventory/host_vars/ele-thetys.yml
@@ -0,0 +1,19 @@
+---
+install:
+  efi: true
+  disks:
+    primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161"
+
+network:
+  nameservers: "{{ network_zones.lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary:
+    interface: eno1
+    ip: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}"
+    mask: "{{ network_zones.lan.prefix | ipaddr('netmask') }}"
+    gateway: "{{ network_zones.lan.gw }}"
+
+admin_user_host:
+- "{{ equinox_user }}"
+
+ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 126f707f..78fa57e5 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -92,6 +92,7 @@ env_group=dan
 ele-media host_name=media
 ele-router
 ele-telesto host_name=telesto
+ele-thetys host_name=thetys
 
 [elevate:children]
 ele-ap
diff --git a/preseed/hosts/thetys_debian-stretch.cfg b/preseed/hosts/thetys_debian-stretch.cfg
deleted file mode 100644
index 8ca9b02f..00000000
--- a/preseed/hosts/thetys_debian-stretch.cfg
+++ /dev/null
@@ -1,114 +0,0 @@
-#########################################################################
-#  spreadspace preseed file for Debian stretch based VMs
-#########################################################################
-
-d-i debian-installer/language string en
-d-i debian-installer/country string AT
-d-i debian-installer/locale string de_AT.UTF-8
-d-i keyboard-configuration/xkb-keymap select de
-
-
-d-i netcfg/choose_interface select eno1
-d-i netcfg/disable_autoconfig boolean true
-
-d-i netcfg/get_hostname string thetys
-d-i netcfg/get_domain string spreadspace.org
-d-i netcfg/wireless_wep string
-
-
-d-i mirror/country string manual
-d-i mirror/http/hostname string debian.ffgraz.net
-d-i mirror/http/directory string /debian
-d-i mirror/http/proxy string
-
-d-i preseed/early_command string h=$(hostname -s); d=$(hostname -d); sed s/$h/thetys/g -i /etc/hosts /etc/hostname; sed s/$d/spreadspace.org/g -i /etc/hosts; hostname thetys
-
-d-i passwd/make-user boolean false
-d-i passwd/root-password password this-very-very-secure-password-will-be-removed-by-latecommand
-d-i passwd/root-password-again password this-very-very-secure-password-will-be-removed-by-latecommand
-
-
-d-i clock-setup/utc boolean true
-d-i time/zone string Europe/Vienna
-d-i clock-setup/ntp boolean false
-
-d-i partman-efi/non_efi_system boolean true
-d-i partman-auto/disk string /dev/sda
-d-i partman-auto/method string lvm
-d-i partman-auto/purge_lvm_from_device boolean true
-d-i partman-auto-lvm/new_vg_name string thetys
-
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
-
-d-i partman/choose_label string gpt
-d-i partman/default_label string gpt
-d-i partman-auto/choose_recipe select boot-root
-d-i partman-auto/expert_recipe string                       \
-      boot-root ::                                          \
-              100 100 128 fat16                             \
-                      $defaultignore{ } $primary{ }         \
-                      $bootable{ } method{ efi } format{ }  \
-              .                                             \
-              1000 10000 -1 ext4                            \
-                      $defaultignore{ } $primary{ }         \
-                      method{ lvm } vg_name{ thetys }       \
-              .                                             \
-              2560 10000 3072 ext4                          \
-                      $lvmok{ } in_vg{ thetys }             \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ / }                       \
-              .                                             \
-              1024 11000 1280 ext4                          \
-                      $lvmok{ } in_vg{ thetys }             \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var }                    \
-              .                                             \
-              768 10000 768 ext4                            \
-                      $lvmok{ } in_vg{ thetys }             \
-                      method{ format } format{ }            \
-                      use_filesystem{ } filesystem{ ext4 }  \
-                      mountpoint{ /var/log }                \
-                      options/nodev{ nodev }                \
-                      options/noatime{ noatime }            \
-                      options/noexec{ noexec }              \
-              .                                             \
-              16 20000 -1 ext4                              \
-                      $lvmok{ } in_vg{ thetys }             \
-                      method( keep } lv_name{ dummy }       \
-              .
-
-d-i partman-auto-lvm/no_boot boolean true
-d-i partman-basicfilesystems/no_swap true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-
-
-d-i base-installer/install-recommends boolean false
-d-i apt-setup/security_host string debian.ffgraz.net
-
-tasksel tasksel/first multiselect
-d-i pkgsel/include string openssh-server python
-d-i pkgsel/upgrade select safe-upgrade
-popularity-contest popularity-contest/participate boolean false
-
-d-i grub-installer/choose_bootdev string /dev/sda
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean false
-
-d-i nobootloader/confirmation_common boolean true
-
-d-i finish-install/reboot_in_progress note
-
-
-d-i preseed/late_command string \
-    lvremove -f thetys/dummy; \
-    in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
-    in-target bash -c "sed 's#GRUB_CMDLINE_LINUX_DEFAULT.*#GRUB_CMDLINE_LINUX_DEFAULT=\"quiet nomodeset consoleblank=0\"#' -i /etc/default/grub && update-grub"; \
-    in-target bash -c "passwd -d root; passwd -l root; umask 077; mkdir -p /root/.ssh/; echo -e 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCtmysXjBidEwJek6hBgaENiyVOwroFi19xRZZw+cYYqi6asDfF6B/h6gYNkJGWo0rD5ZaLdau1O210O5Xu+TfK1e2bZbxuFIj2fguUkat9wN6IQIO2m2Wcf4k/eiTmtAE3dp0l5ThMqfxxE8dj76mOOrUHCfJUIVoATGs4X5TLcGcXroAcZ+DFFoDzjxjFYNmIuUNtXDwXTpPc63SAYmRvW0ZYZlvH1qZ6irLh+GtE1dZ1Q5lQZvp6xUYcjInbpcd5Ko3KbG/In7sNmUCI7iaTwC4DPDTcHFj99Ll1jruAbdaQqe+ClZv55dbQ+92RDF6fsuQBD8FeRz7nYChvCqNPT1KOvcVsDtbW0iJ1PZ05QdE27w23wJj9OE0JWM09P3AH3ttswHaJ+P4s7mSxxK2m6YZcqop3czLlWWoGna0ynd5eV6l/rtvAQUvBOXjKQ5fPQY5d9cF0Z87NBE54HM9a/IKZ2toU2MuYNUpI/DUoAA9ILS4bJm3AUz8wbaC5EiuIhbM6I/u0NANamaQKRrolGNP4ETaQvhABs+S3/NSSBy4DMjtwax2BxyenF6i89vyHPNY+LZzBOn842yUlEGn6Z11MxiE5fhIfMPUclSYi5bQJDf1fvAyAo59/AX8sPqRK+/OCLIgLwdtW6D4OZGXjqrBJe2j/5uZSJEsl6ROyKw== equinox@spreadspace.org' > /root/.ssh/authorized_keys"
diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2
index efd7bb87..0d44b35f 100644
--- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -60,8 +60,19 @@ d-i partman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
+{% if (hostvars[hostname].install_cooked.efi | default(false)) %}
+d-i partman-efi/non_efi_system boolean true
+d-i partman/choose_label string gpt
+d-i partman/default_label string gpt
+{% endif %}
 d-i partman-auto/expert_recipe string                                             \
       boot-root ::                                                                \
+{% if (hostvars[hostname].install_cooked.efi | default(false)) %}
+              100 100 128 fat16                                                   \
+                      $defaultignore{ } $primary{ } $bootable{ }                  \
+                      method{ efi } format{ }                                     \
+              .                                                                   \
+{% endif %}
               1000 10000 -1 ext4                                                  \
                       $defaultignore{ } $primary{ } $bootable{ }                  \
                       method{ lvm } vg_name{ {{ hostvars[hostname].host_name }} } \
diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
index 4e3e39c2..677752b6 100644
--- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
+++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2
@@ -65,8 +65,19 @@ d-i partman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
+{% if (hostvars[hostname].install_cooked.efi | default(false)) %}
+d-i partman-efi/non_efi_system boolean true
+d-i partman/choose_label string gpt
+d-i partman/default_label string gpt
+{% endif %}
 d-i partman-auto/expert_recipe string                                             \
       boot-root ::                                                                \
+{% if (hostvars[hostname].install_cooked.efi | default(false)) %}
+              100 100 128 fat16                                                   \
+                      $defaultignore{ } $primary{ } $bootable{ }                  \
+                      method{ efi } format{ }                                     \
+              .                                                                   \
+{% endif %}
               1000 10000 -1 ext4                                                  \
                       $defaultignore{ } $primary{ } $bootable{ }                  \
                       method{ lvm } vg_name{ {{ hostvars[hostname].host_name }} } \
diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
index 9c50a3d8..7dfd5d97 100644
--- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
+++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2
@@ -65,8 +65,19 @@ d-i partman-md/device_remove_md boolean true
 d-i partman-lvm/confirm boolean true
 d-i partman-lvm/confirm_nooverwrite boolean true
 
+{% if (hostvars[hostname].install_cooked.efi | default(false)) %}
+d-i partman-efi/non_efi_system boolean true
+d-i partman/choose_label string gpt
+d-i partman/default_label string gpt
+{% endif %}
 d-i partman-auto/expert_recipe string                                             \
       boot-root ::                                                                \
+{% if (hostvars[hostname].install_cooked.efi | default(false)) %}
+              100 100 128 fat16                                                   \
+                      $defaultignore{ } $primary{ } $bootable{ }                  \
+                      method{ efi } format{ }                                     \
+              .                                                                   \
+{% endif %}
               1000 10000 -1 ext4                                                  \
                       $defaultignore{ } $primary{ } $bootable{ }                  \
                       method{ lvm } vg_name{ {{ hostvars[hostname].host_name }} } \