diff options
24 files changed, 32 insertions, 366 deletions
diff --git a/inventory/group_vars/emc/vars.yml b/inventory/group_vars/emc/vars.yml index 28290566..d0a043b9 100644 --- a/inventory/group_vars/emc/vars.yml +++ b/inventory/group_vars/emc/vars.yml @@ -1,28 +1,11 @@ --- zsh_banner: elevate +system_lvm_volume_size_root: 3G install: cloud: credentials: token: "{{ vault_hcloud_api_token }}" - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec prometheus_scrape_endpoint: "{{ ansible_default_ipv4.address }}:9999" diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml index 92ce463c..d966a8cc 100644 --- a/inventory/host_vars/ch-apps.yml +++ b/inventory/host_vars/ch-apps.yml @@ -1,6 +1,7 @@ --- install_jumphost: ch-jump +system_lvm_volume_size_root: 4G install: vm: memory: 12G @@ -24,24 +25,6 @@ install: size: 100g properties: 'syncoid:sync': 'false' - system_lvm: - volumes: - - name: root - size: 4G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec interfaces: - bridge: br-svc name: svc0 diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index ef9d8657..d9feac7c 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index 816b38f8..9640c409 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/ch-k8s-ctrl.yml b/inventory/host_vars/ch-k8s-ctrl.yml index 63723000..86b1d225 100644 --- a/inventory/host_vars/ch-k8s-ctrl.yml +++ b/inventory/host_vars/ch-k8s-ctrl.yml @@ -1,6 +1,7 @@ --- install_jumphost: ch-jump +system_lvm_volume_size_root: 3G install: vm: memory: 4G @@ -15,24 +16,6 @@ install: size: 20g properties: 'syncoid:sync': 'false' - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec interfaces: - bridge: br-svc name: svc0 diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index aee2fa18..6863c248 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -1,4 +1,6 @@ --- +system_lvm_volume_size_root: 3G + install: efi: true disks: diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index 6c26d22f..751fe338 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index 7a3d082e..dd749fbf 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index 6c60abee..b2f9f110 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3584M install: efi: true disks: primary: /dev/disk/by-id/ata-Samsung_SSD_840_Series_S14GNEACC92243K - system_lvm: - volumes: - - name: root - size: 3584M - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 4db87e7c..bd22ef27 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" diff --git a/inventory/host_vars/emc-ctrl.yml b/inventory/host_vars/emc-ctrl.yml index 1ca011ec..f926c7d2 100644 --- a/inventory/host_vars/emc-ctrl.yml +++ b/inventory/host_vars/emc-ctrl.yml @@ -1,4 +1,5 @@ --- +system_lvm_volume_size_root: 3G install: vm: memory: 10G @@ -14,24 +15,6 @@ install: sdb: type: blockdev path: /dev/zvol/storage/streamstats - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec interfaces: - bridge: br-public name: primary0 diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index 42a9d7d8..b8ef59e3 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-5328NA52AN84G246 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index c55b81b5..583fc56a 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NY0HC29501 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index 1f9eead6..22880793 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/nvme-SAMSUNG_MZVPW256HEGL-00000_S346NB0J803346 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index 7b979511..7f3440f6 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/ata-? - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" - "nomodeset" diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index dbe2e76a..072f68ce 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: true disks: primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml index ddbebc24..851c13fe 100644 --- a/inventory/host_vars/glt-tsdatacop.yml +++ b/inventory/host_vars/glt-tsdatacop.yml @@ -1,26 +1,9 @@ --- +system_lvm_volume_size_root: 3G install: efi: false disks: primary: /dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_200854446208 - system_lvm: - volumes: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec kernel_cmdline: - "consoleblank=0" diff --git a/inventory/host_vars/sk-2019vm.yml b/inventory/host_vars/sk-2019vm.yml index 7c551ac2..6f14a63f 100644 --- a/inventory/host_vars/sk-2019vm.yml +++ b/inventory/host_vars/sk-2019vm.yml @@ -1,4 +1,5 @@ --- +system_lvm_volume_size_root: 3072M install: cloud: credentials: "{{ vault_hroot_robot_account }}" @@ -12,23 +13,6 @@ install: - /dev/nvme1n1 system_lvm: size: 10G - volumes: - - name: root - size: 3072M - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec network: nameservers: "{{ vm_host.network.dns }}" diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index 1f09cc52..25796113 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -1,4 +1,5 @@ --- +system_lvm_volume_size_root: 3584M install: cloud: credentials: "{{ vault_hroot_robot_account }}" @@ -12,23 +13,6 @@ install: - /dev/nvme1n1 system_lvm: size: 15G - volumes: - - name: root - size: 3584M - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 1536 - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec apt_repo_components: diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index 2b346f43..d7222469 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -1,4 +1,5 @@ --- +system_lvm_volume_size_root: 3G install: vm: memory: 16G @@ -17,23 +18,6 @@ install: size: 800g properties: compression: off - system_lvm: - - name: root - size: 3G - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec interfaces: - bridge: br-public name: primary0 diff --git a/inventory/host_vars/sk-tomnext.yml b/inventory/host_vars/sk-tomnext.yml index 16441fac..9017b2aa 100644 --- a/inventory/host_vars/sk-tomnext.yml +++ b/inventory/host_vars/sk-tomnext.yml @@ -1,4 +1,5 @@ --- +system_lvm_volume_size_root: 3072M install: cloud: credentials: "{{ vault_hroot_robot_account }}" @@ -12,23 +13,6 @@ install: - /dev/nvme1n1 system_lvm: size: 10G - volumes: - - name: root - size: 3072M - filesystem: ext4 - mountpoint: / - - name: var - size: 1280M - filesystem: ext4 - mountpoint: /var - - name: var+log - size: 768M - filesystem: ext4 - mountpoint: /var/log - mount_options: - - noatime - - nodev - - noexec network: nameservers: "{{ vm_host.network.dns }}" diff --git a/roles/cloud/install/defaults/main.yml b/roles/cloud/install/defaults/main.yml index 975400a5..195b6bd0 100644 --- a/roles/cloud/install/defaults/main.yml +++ b/roles/cloud/install/defaults/main.yml @@ -4,15 +4,15 @@ hetzner_boot_size: 512M hetzner_system_lvm_size_default: all hetzner_system_lvm_volumes_default: - name: root - size: 2560M + size: "{{ system_lvm_volume_size_root | default('2560M') }}" filesystem: ext4 mountpoint: / - name: var - size: 1280M + size: "{{ system_lvm_volume_size_var | default('1280M') }}" filesystem: ext4 mountpoint: /var - name: var+log - size: 768M + size: "{{ system_lvm_volume_size_varlog | default('768M') }}" filesystem: ext4 mountpoint: /var/log mount_options: diff --git a/roles/installer/debian/preseed/defaults/main.yml b/roles/installer/debian/preseed/defaults/main.yml index fd57ef57..7e271783 100644 --- a/roles/installer/debian/preseed/defaults/main.yml +++ b/roles/installer/debian/preseed/defaults/main.yml @@ -31,15 +31,15 @@ debian_preseed_system_lvm_reserve_default: 384M debian_preseed_system_lvm_size_default: all debian_preseed_system_lvm_volumes_default: - name: root - size: 2560M + size: "{{ system_lvm_volume_size_root | default('2560M') }}" filesystem: ext4 mountpoint: / - name: var - size: 1280M + size: "{{ system_lvm_volume_size_var | default('1280M') }}" filesystem: ext4 mountpoint: /var - name: var+log - size: 768M + size: "{{ system_lvm_volume_size_varlog | default('768M') }}" filesystem: ext4 mountpoint: /var/log mount_options: diff --git a/roles/installer/ubuntu/autoinstall/defaults/main.yml b/roles/installer/ubuntu/autoinstall/defaults/main.yml index 4af5a42d..1115442e 100644 --- a/roles/installer/ubuntu/autoinstall/defaults/main.yml +++ b/roles/installer/ubuntu/autoinstall/defaults/main.yml @@ -18,20 +18,20 @@ ubuntu_autoinstall_swraid_boot_size: 256M ubuntu_autoinstall_system_lvm_size_default: all ubuntu_autoinstall_system_lvm_volumes_default: - name: root - size: 2.5G + size: "{{ system_lvm_volume_size_root | default('2560M') }}" filesystem: ext4 mountpoint: / - name: var - size: 1280M + size: "{{ system_lvm_volume_size_var | default('1280M') }}" filesystem: ext4 mountpoint: /var - name: var+log - size: 768M + size: "{{ system_lvm_volume_size_varlog | default('768M') }}" filesystem: ext4 mountpoint: /var/log mount_options: - - nodev - noatime + - nodev - noexec |