X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Fpreseed%2Ftemplates%2Fpreseed_debian-stretch.cfg.j2;h=29a5cbd431a6cc88f4e61c3c81987d52f9230efc;hb=7240d3f90cf4b1f9a0b0fddb43b49fbb0a37211e;hp=37f428b9ce159f31e4f5190e01da8e3d84783dfc;hpb=cafce182458f3ead9b106bfc377cb7215eae2a04;p=noc.git

diff --git a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
index 37f428b..29a5cbd 100644
--- a/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
+++ b/ansible/roles/preseed/templates/preseed_debian-stretch.cfg.j2
@@ -7,17 +7,19 @@ d-i debian-installer/country string AT
 d-i debian-installer/locale string en_US.UTF-8
 d-i keyboard-configuration/xkb-keymap select us
 
+d-i hw-detect/load_firmware boolean false
+
 d-i netcfg/disable_dhcp boolean true
-d-i netcfg/choose_interface select enp1s1
+d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }}
 d-i netcfg/disable_autoconfig boolean false
-d-i netcfg/get_ipaddress string {{ hostvars[hostname].vm_network_cooked.primary.ip }}
-d-i netcfg/get_netmask string {{ hostvars[hostname].vm_network_cooked.primary.mask }}
-d-i netcfg/get_gateway string {{ hostvars[hostname].vm_network_cooked.primary.gateway }}
-d-i netcfg/get_nameservers string {{ hostvars[hostname].vm_network_cooked.nameservers | join(' ') }}
+d-i netcfg/get_ipaddress string {{ hostvars[hostname].network_cooked.primary.ip }}
+d-i netcfg/get_netmask string {{ hostvars[hostname].network_cooked.primary.mask }}
+d-i netcfg/get_gateway string {{ hostvars[hostname].network_cooked.primary.gateway }}
+d-i netcfg/get_nameservers string {{ hostvars[hostname].network_cooked.nameservers | join(' ') }}
 d-i netcfg/confirm_static boolean true
 
 d-i netcfg/get_hostname string {{ hostname }}
-d-i netcfg/get_domain string {{ hostvars[hostname].vm_network_cooked.domain }}
+d-i netcfg/get_domain string {{ hostvars[hostname].network_cooked.domain }}
 d-i netcfg/wireless_wep string
 
 
@@ -37,8 +39,12 @@ d-i time/zone string Europe/Vienna
 d-i clock-setup/ntp boolean false
 
 
-d-i partman-auto/disk string /dev/{{ hostvars[hostname].vm_install_cooked.disks.primary }}
+d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }}
 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 {{ hostname }}
+d-i partman-auto-lvm/guided_size string max
+
 d-i partman-lvm/device_remove_lvm boolean true
 d-i partman-md/device_remove_md boolean true
 
@@ -49,22 +55,22 @@ d-i partman-auto/expert_recipe string                                   \
       boot-root ::                                                      \
               1000 10000 -1 ext4                                        \
                       $defaultignore{ } $primary{ } $bootable{ }        \
-                      method{ lvm } vg_name{ {{ hostname }} }             \
+                      method{ lvm } vg_name{ {{ hostname }} }           \
               .                                                         \
               2048 10000 2560 ext4                                      \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method{ format } format{ }                        \
                       use_filesystem{ } filesystem{ ext4 }              \
                       mountpoint{ / }                                   \
               .                                                         \
               1024 11000 1280 ext4                                      \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method{ format } format{ }                        \
                       use_filesystem{ } filesystem{ ext4 }              \
                       mountpoint{ /var }                                \
               .                                                         \
               768 10000 768 ext4                                        \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method{ format } format{ }                        \
                       use_filesystem{ } filesystem{ ext4 }              \
                       mountpoint{ /var/log }                            \
@@ -72,7 +78,7 @@ d-i partman-auto/expert_recipe string                                   \
                       options/noexec{ noexec }                          \
               .                                                         \
               16 20000 -1 ext4                                          \
-                      $lvmok{ } in_vg{ {{ hostname }} }                   \
+                      $lvmok{ } in_vg{ {{ hostname }} }                 \
                       method( keep } lv_name{ dummy }                   \
               .
 
@@ -92,7 +98,7 @@ 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/{{ hostvars[hostname].vm_install_cooked.disks.primary }}
+d-i grub-installer/choose_bootdev string /dev/{{ hostvars[hostname].install_cooked.disks.primary }}
 d-i grub-installer/only_debian boolean true
 d-i grub-installer/with_other_os boolean false
 
@@ -103,6 +109,7 @@ d-i preseed/late_command string \
     lvremove -f {{ hostname }}/dummy; \
     in-target bash -c "apt-get update -q && apt-get full-upgrade -y -q"; \
     in-target bash -c "passwd -d root && passwd -l root"; \
+    in-target bash -c "sed -e 's/^allow-hotplug/auto/' -i /etc/network/interfaces"; \
     mkdir -p -m 0700 /target/root/.ssh; \
     cp /authorized_keys /target/root/.ssh/; \
 {% if hostvars[hostname].ansible_port is defined %}