prepare install config and playbooks for ele-(helene,dione,telesto)

3 files changed, 59 insertions, 87 deletions

diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 59420d8d..643682e0 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -9,13 +9,12 @@ install:
     - "nomodeset"
 
 network:
-  nameservers:
-  - 1.1.1.1
+  nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
-    address: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets['ele-mur']) | ipaddr('address') }}"
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
 
@@ -52,18 +51,13 @@ kubelet_storage:
 ntp_variant: chrony
 
 ntp_client:
-  pools:
-  - name: at.pool.ntp.org
-    options: iburst
+  servers:
+  - name: "{{ kubeguard.direct_net_zones.encoder.transfer_net | ipaddr(kubeguard.node_index['ele-telesto']) | ipaddr('address') }}"
+    options: iburst minpoll 1 maxpoll 3 polltarget 30
 
 ntp_hwtimestamp_interfaces:
   - name: "*"
 
-ntp_server:
-  local: stratum 8
-  allow:
-  - "{{ kubeguard.direct_net_zones.encoder.transfer_net }}"
-
 
 blackmagic_desktopvideo_version: 12.2.2a6
 blackmagic_desktopvideo_include_gui: yes
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 2e4f8f6c..e70cf2df 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -1,5 +1,6 @@
 ---
-system_lvm_volume_size_root: 3G
+install_interface: eno1
+
 install:
   efi: true
   disks:
@@ -9,15 +10,16 @@ install:
     - "nomodeset"
 
 network:
-  nameservers:
-  - 1.1.1.1
+  nameservers: "{{ network_zones.lan.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
-    name: eno1
-    address: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets['ele-mur']) | ipaddr('address') }}"
+    name: br-lan
+    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.lan.gateway }}"
   interfaces:
   - *_network_primary_
+  vlans:
+    eno2: "{{ __vmhost_bridge_interface_zones__['eno2'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
 
 
 apt_repo_components:
@@ -26,40 +28,13 @@ apt_repo_components:
   - non-free ## for microcode updates
 
 spreadspace_apt_repo_components:
+  - main
   - prometheus
-  - container
-
-
-admin_users_host:
-  - equinox
 
 
-containerd_storage:
-  type: lvm
-  vg: "{{ host_name }}"
-  lv: containerd
-  size: 15G
-  fs: ext4
-
-kubelet_storage:
+installer_storage:
   type: lvm
   vg: "{{ host_name }}"
-  lv: kubelet
-  size: 10G
+  lv: installer
+  size: 3G
   fs: ext4
-
-
-ntp_variant: chrony
-
-ntp_client:
-  servers:
-  - name: "{{ kubeguard.direct_net_zones.encoder.transfer_net | ipaddr(kubeguard.node_index['ele-dione']) | ipaddr('address') }}"
-    options: iburst minpoll 1 maxpoll 3 polltarget 30
-
-ntp_hwtimestamp_interfaces:
-  - name: "*"
-
-
-
-blackmagic_desktopvideo_version: 12.2.2a6
-blackmagic_desktopvideo_include_gui: yes
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index 47f000f1..fa4675c7 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -1,62 +1,65 @@
 ---
-install_interface: enp3s0
-
+system_lvm_volume_size_root: 3G
 install:
-  efi: yes
+  efi: true
   disks:
-    primary: /dev/disk/by-id/ata-?
-  system_lvm:
-    size: 15G
+    primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_512GB_S5JYNC0N310329Z
 
 network:
-  nameservers: "{{ network_zones.lan.dns }}"
+  nameservers: "{{ network_zones.cc_hmtsaal.dns }}"
   domain: "{{ host_domain }}"
   primary: &_network_primary_
-    name: br-lan
-    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
+    name: eno1
+    address: "{{ network_zones.cc_hmtsaal.prefix | ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.cc_hmtsaal.gateway }}"
   interfaces:
   - *_network_primary_
-  vlans:
-    eno1: "{{ __vmhost_bridge_interface_zones__['eno1'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
 
 
 apt_repo_components:
   - main
-  - contrib  ## for zfs
+  - contrib
   - non-free ## for microcode updates
 
 spreadspace_apt_repo_components:
-  - main
   - prometheus
+  - container
+
+
+admin_users_host:
+  - equinox
 
 
-installer_storage:
+containerd_storage:
   type: lvm
   vg: "{{ host_name }}"
-  lv: installer
-  size: 3G
+  lv: containerd
+  size: 15G
   fs: ext4
 
+kubelet_storage:
+  type: lvm
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 10G
+  fs: ext4
+
+
+ntp_variant: chrony
+
+ntp_client:
+  pools:
+  - name: at.pool.ntp.org
+    options: iburst
+
+ntp_hwtimestamp_interfaces:
+  - name: "*"
+
+ntp_server:
+  local: stratum 8
+  allow:
+  - "{{ kubeguard.direct_net_zones.encoder.transfer_net }}"
+
 
-zfs_arc_size:
-  min: 1GB
-  max: 4GB
-
-zfs_pools:
-  ssd:
-    mountpoint: /srv/ssd
-    create_vdevs: ata-?
-  storage:
-    mountpoint: /srv/storage
-    create_vdevs: mirror /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720808 /dev/disk/by-id/ata-SAMSUNG_HD103UJ_S1PVJDWQ720810
-
-zfs_sanoid_modules:
-  nvme/vm:
-    use_template: production
-    recursive: yes
-    process_children_only: yes
-  storage/vm:
-    use_template: production
-    recursive: yes
-    process_children_only: yes
+blackmagic_desktopvideo_version: 12.2.2a6
+blackmagic_desktopvideo_include_gui: yes