From a1827fa8f5add7a6780f7f7436ebcbac8b003998 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 13 Jan 2022 21:31:14 +0100
Subject: prepare k8s-emc cluster for bullseye and 1.23

---
 inventory/host_vars/ele-dione.yml  | 25 +++++++++++++++++++------
 inventory/host_vars/ele-helene.yml | 25 +++++++++++++++++++------
 inventory/host_vars/emc-master.yml | 24 ++++++++++++++++++++++++
 3 files changed, 62 insertions(+), 12 deletions(-)

(limited to 'inventory/host_vars')

diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 37523b61..6c26d22f 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -3,6 +3,24 @@ 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"
@@ -25,19 +43,14 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 spreadspace_apt_repo_components:
-  - main
   - prometheus
   - container
 
 
-base_packages_extra_host:
-  - exfat-fuse
-  - exfat-utils
-  - vlan
-
 admin_users_host:
   - equinox
 
+
 containerd_storage:
   type: lvm
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 21d7eb5a..7a3d082e 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -3,6 +3,24 @@ 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"
@@ -25,19 +43,14 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 spreadspace_apt_repo_components:
-  - main
   - prometheus
   - container
 
 
-base_packages_extra_host:
-  - exfat-fuse
-  - exfat-utils
-  - vlan
-
 admin_users_host:
   - equinox
 
+
 containerd_storage:
   type: lvm
   vg: "{{ host_name }}"
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index 77cc5d32..6ee3587a 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -11,6 +11,24 @@ install:
         type: zfs
         name: root
         size: 20g
+  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
       sdb:
         type: blockdev
         path: /dev/zvol/storage/streamstats
@@ -34,6 +52,12 @@ network:
 
 external_ip: "{{ network.primary.overlay }}"
 
+
+spreadspace_apt_repo_components:
+  - prometheus
+  - container
+
+
 containerd_storage:
   type: lvm
   vg: "{{ host_name }}"
-- 
cgit v1.2.3