diff options
-rw-r--r-- | inventory/host_vars/ele-media.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/emc-master.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/emc-stats.yml | 2 | ||||
-rw-r--r-- | inventory/host_vars/k8s-test2.yml | 2 | ||||
-rw-r--r-- | roles/preseed/templates/preseed_debian-stretch.cfg.j2 | 6 | ||||
-rw-r--r-- | roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 | 6 | ||||
-rw-r--r-- | roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 | 6 |
7 files changed, 16 insertions, 10 deletions
diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index d7d7f6ef..e4cdb1a8 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -10,7 +10,7 @@ network: install: disks: - primary: sda + primary: /dev/disk/by-id/ata-Samsung_SSD_840_Series_S14GNEACC92243K docker_lvm: vg: "{{ host_name }}" diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml index 83fc7d29..d590908e 100644 --- a/inventory/host_vars/emc-master.yml +++ b/inventory/host_vars/emc-master.yml @@ -6,7 +6,7 @@ install: mem: 1024 numcpu: 2 disks: - primary: vda + primary: /dev/vda virtio: vda: vg: storage diff --git a/inventory/host_vars/emc-stats.yml b/inventory/host_vars/emc-stats.yml index 41f30645..e6de5859 100644 --- a/inventory/host_vars/emc-stats.yml +++ b/inventory/host_vars/emc-stats.yml @@ -6,7 +6,7 @@ install: mem: 8192 numcpu: 6 disks: - primary: vda + primary: /dev/vda virtio: vda: vg: storage diff --git a/inventory/host_vars/k8s-test2.yml b/inventory/host_vars/k8s-test2.yml index 13b346c5..7ae77b77 100644 --- a/inventory/host_vars/k8s-test2.yml +++ b/inventory/host_vars/k8s-test2.yml @@ -6,7 +6,7 @@ install: mem: 1024 numcpu: 2 disks: - primary: vda + primary: /dev/vda virtio: vda: vg: storage diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index 7237fa6d..e96a663b 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -41,7 +41,10 @@ d-i time/zone string Europe/Vienna d-i clock-setup/ntp boolean false -d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i partman/early_command string \ + debconf-set partman-auto/disk "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + debconf-set grub-installer/choose_bootdev "$(readlink -f {{ 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 {{ hostvars[hostname].host_name }} @@ -100,7 +103,6 @@ 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].install_cooked.disks.primary }} d-i grub-installer/only_debian boolean true d-i grub-installer/with_other_os boolean false diff --git a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 index b9263074..6129aa69 100644 --- a/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-bionic.cfg.j2 @@ -46,7 +46,10 @@ d-i time/zone string Europe/Vienna d-i clock-setup/ntp boolean false -d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i partman/early_command string \ + debconf-set partman-auto/disk "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + debconf-set grub-installer/choose_bootdev "$(readlink -f {{ 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 {{ hostvars[hostname].host_name }} @@ -106,7 +109,6 @@ d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none -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 diff --git a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 index 0b725c6f..bf680966 100644 --- a/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 +++ b/roles/preseed/templates/preseed_ubuntu-xenial.cfg.j2 @@ -46,7 +46,10 @@ d-i time/zone string Europe/Vienna d-i clock-setup/ntp boolean false -d-i partman-auto/disk string /dev/{{ hostvars[hostname].install_cooked.disks.primary }} +d-i partman/early_command string \ + debconf-set partman-auto/disk "$(readlink -f {{ hostvars[hostname].install_cooked.disks.primary }})"; \ + debconf-set grub-installer/choose_bootdev "$(readlink -f {{ 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 {{ hostvars[hostname].host_name }} @@ -106,7 +109,6 @@ d-i pkgsel/upgrade select safe-upgrade popularity-contest popularity-contest/participate boolean false d-i pkgsel/update-policy select none -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 |