add hosts glt-calypso and glt-telesto, also some cosmetic cleanups

16 files changed, 231 insertions, 11 deletions

diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml
index 7a626488..024e6896 100644
--- a/inventory/host_vars/ch-calypso.yml
+++ b/inventory/host_vars/ch-calypso.yml
@@ -14,7 +14,7 @@ preseed_install_tasks:
 install:
   efi: yes
   disks:
-    primary: "/dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A"
+    primary: /dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A
   system_lvm:
     volumes:
     - name: root
diff --git a/inventory/host_vars/ch-epimetheus.yml b/inventory/host_vars/ch-epimetheus.yml
index 8545c76b..0004032e 100644
--- a/inventory/host_vars/ch-epimetheus.yml
+++ b/inventory/host_vars/ch-epimetheus.yml
@@ -2,7 +2,7 @@
 install:
   efi: true
   disks:
-    primary: "/dev/disk/by-id/ata-KINGSTON_SMS200S360G_50026B7244002329"
+    primary: /dev/disk/by-id/ata-KINGSTON_SMS200S360G_50026B7244002329
 
 network:
   nameservers: "{{ network_zones.lan.dns }}"
diff --git a/inventory/host_vars/ch-mc.yml b/inventory/host_vars/ch-mc.yml
index a91639d1..730a6569 100644
--- a/inventory/host_vars/ch-mc.yml
+++ b/inventory/host_vars/ch-mc.yml
@@ -14,7 +14,7 @@ preseed_install_tasks:
 install:
   efi: no
   disks:
-    primary: "/dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-B7P98I86F4PC14I7"
+    primary: /dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-B7P98I86F4PC14I7
   system_lvm:
     volumes:
     - name: root
diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml
index 699570d5..f9ee0469 100644
--- a/inventory/host_vars/ch-telesto.yml
+++ b/inventory/host_vars/ch-telesto.yml
@@ -14,7 +14,7 @@ preseed_install_tasks:
 install:
   efi: yes
   disks:
-    primary: "/dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-5328NA52AN84G246"
+    primary: /dev/disk/by-id/ata-OCZ-VERTEX2_OCZ-5328NA52AN84G246
   system_lvm:
     volumes:
     - name: root
diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml
index ae695098..5249b511 100644
--- a/inventory/host_vars/ch-thetys.yml
+++ b/inventory/host_vars/ch-thetys.yml
@@ -2,7 +2,7 @@
 install:
   efi: true
   disks:
-    primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161"
+    primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161
   kernel_cmdline:
     - "consoleblank=0"
 
diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml
index dea04565..1179e095 100644
--- a/inventory/host_vars/ele-thetys.yml
+++ b/inventory/host_vars/ele-thetys.yml
@@ -2,7 +2,7 @@
 install:
   efi: true
   disks:
-    primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161"
+    primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161
   kernel_cmdline:
     - "consoleblank=0"
 
diff --git a/inventory/host_vars/ff-60gtest-eur20.yml b/inventory/host_vars/ff-60gtest-eur20.yml
index c64585ce..21b18761 100644
--- a/inventory/host_vars/ff-60gtest-eur20.yml
+++ b/inventory/host_vars/ff-60gtest-eur20.yml
@@ -2,7 +2,7 @@
 install:
   arch: i386
   disks:
-    primary: "/dev/disk/by-id/ata-SanDisk_SDCFX3-004G_119310H2208K0505"
+    primary: /dev/disk/by-id/ata-SanDisk_SDCFX3-004G_119310H2208K0505
   kernel_cmdline:
     - console=ttyS0,115200n8
     - lowmem=1
diff --git a/inventory/host_vars/ff-60gtest-mkl.yml b/inventory/host_vars/ff-60gtest-mkl.yml
index 2dd37638..31147762 100644
--- a/inventory/host_vars/ff-60gtest-mkl.yml
+++ b/inventory/host_vars/ff-60gtest-mkl.yml
@@ -2,7 +2,7 @@
 install:
   arch: i386
   disks:
-    primary: "/dev/disk/by-id/ata-CF_CARD_4GB_5B091BE30"
+    primary: /dev/disk/by-id/ata-CF_CARD_4GB_5B091BE30
   kernel_cmdline:
     - console=ttyS0,115200n8
     - lowmem=1
diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml
new file mode 100644
index 00000000..60b57644
--- /dev/null
+++ b/inventory/host_vars/glt-calypso.yml
@@ -0,0 +1,65 @@
+---
+install:
+  efi: true
+  disks:
+    primary: /dev/disk/by-id/ata-Samsung_SSD_840_PRO_Series_S1ATNSAD703481A
+  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"
+
+network:
+  nameservers: "{{ network_zones.r3_lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}"
+  interfaces:
+  - *_network_primary_
+
+
+apt_repo_components:
+  - main
+  - contrib
+  - non-free ## for microcode updates
+
+
+blackmagic_desktopvideo_version: 11.7a12
+
+docker_pkg_provider: docker-com
+docker_pkg_name: docker-ce
+
+docker_lvm:
+  vg: "{{ host_name }}"
+  lv: docker
+  size: 15G
+  fs: ext4
+
+kubelet_lvm:
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 10G
+  fs: ext4
+
+kubernetes_version: 1.20.5
+kubernetes_container_runtime: docker
+kubernetes_standalone_max_pods: 42
+kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml
new file mode 100644
index 00000000..99c6a554
--- /dev/null
+++ b/inventory/host_vars/glt-telesto.yml
@@ -0,0 +1,65 @@
+---
+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"
+
+network:
+  nameservers: "{{ network_zones.r3_lan.dns }}"
+  domain: "{{ host_domain }}"
+  primary: &_network_primary_
+    name: eno1
+    address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}"
+  interfaces:
+  - *_network_primary_
+
+
+apt_repo_components:
+  - main
+  - contrib
+  - non-free ## for microcode updates
+
+
+blackmagic_desktopvideo_version: 11.7a12
+
+docker_pkg_provider: docker-com
+docker_pkg_name: docker-ce
+
+docker_lvm:
+  vg: "{{ host_name }}"
+  lv: docker
+  size: 15G
+  fs: ext4
+
+kubelet_lvm:
+  vg: "{{ host_name }}"
+  lv: kubelet
+  size: 10G
+  fs: ext4
+
+kubernetes_version: 1.20.5
+kubernetes_container_runtime: docker
+kubernetes_standalone_max_pods: 42
+kubernetes_standalone_cni_variant: with-portmap
diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml
index 67142b1e..43fac512 100644
--- a/inventory/host_vars/glt-thetys.yml
+++ b/inventory/host_vars/glt-thetys.yml
@@ -2,7 +2,7 @@
 install:
   efi: true
   disks:
-    primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161"
+    primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161
   system_lvm:
     volumes:
     - name: root
diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml
index 1e460aba..7387bc89 100644
--- a/inventory/host_vars/lw-thetys.yml
+++ b/inventory/host_vars/lw-thetys.yml
@@ -2,7 +2,7 @@
 install:
   efi: true
   disks:
-    primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161"
+    primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161
   kernel_cmdline:
     - "consoleblank=0"
 
diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml
index 7f2b00eb..2da1e3c1 100644
--- a/inventory/host_vars/s2-thetys.yml
+++ b/inventory/host_vars/s2-thetys.yml
@@ -2,7 +2,7 @@
 install:
   efi: true
   disks:
-    primary: "/dev/disk/by-id/ata-TS32GMSA370_B475040161"
+    primary: /dev/disk/by-id/ata-TS32GMSA370_B475040161
   kernel_cmdline:
     - "consoleblank=0"
 
diff --git a/inventory/hosts.ini b/inventory/hosts.ini
index 13671044..9a36c60d 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -149,6 +149,8 @@ glt-jitsi host_name=cdn12
 glt-gw-r3 host_name=gw-r3
 glt-dione host_name=dione
 glt-helene host_name=helene
+glt-calypso host_name=calypso
+glt-telesto host_name=telesto
 glt-thetys host_name=thetys
 
 [glt-live-tug]
@@ -437,6 +439,8 @@ glt-coturn
 glt-jitsi
 glt-dione
 glt-helene
+glt-calypso
+glt-telesto
 glt-thetys
 
 [kubernetes:children]
diff --git a/spreadspace/glt-calypso.yml b/spreadspace/glt-calypso.yml
new file mode 100644
index 00000000..a7c08671
--- /dev/null
+++ b/spreadspace/glt-calypso.yml
@@ -0,0 +1,43 @@
+---
+- name: Basic Setup
+  hosts: glt-calypso
+  roles:
+  - role: apt-repo/base
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
+  - role: core/ntp
+  - role: core/cpu-microcode
+  - role: apt-repo/spreadspace
+  - role: streaming/blackmagic/desktopvideo
+  - role: kubernetes/base
+  - role: kubernetes/standalone/base
+  #- role: streaming/rtmp/streamer
+  post_tasks:
+  - name: install lm-sensors and i7z
+    apt:
+      name:
+      - lm-sensors
+      - i7z
+
+  - name: load modules for lm-sensors
+    vars:
+      sensors_modules:
+      - coretemp
+      - w83627ehf
+    block:
+    - name: load special modules for lm-sensors
+      loop: "{{ sensors_modules }}"
+      modprobe:
+        name: "{{ item }}"
+        state: present
+
+    - name: make sure sensor modules are loaded on reboot
+      copy:
+        content: |
+          # Ansible managed
+
+          {% for module in sensors_modules %}
+          {{ module }}
+          {% endfor %}
+        dest: /etc/modules-load.d/sensors.conf
diff --git a/spreadspace/glt-telesto.yml b/spreadspace/glt-telesto.yml
new file mode 100644
index 00000000..3e982e51
--- /dev/null
+++ b/spreadspace/glt-telesto.yml
@@ -0,0 +1,43 @@
+---
+- name: Basic Setup
+  hosts: glt-telesto
+  roles:
+  - role: apt-repo/base
+  - role: core/base
+  - role: core/sshd
+  - role: core/zsh
+  - role: core/ntp
+  - role: core/cpu-microcode
+  - role: apt-repo/spreadspace
+  - role: streaming/blackmagic/desktopvideo
+  - role: kubernetes/base
+  - role: kubernetes/standalone/base
+  #- role: streaming/rtmp/streamer
+  post_tasks:
+  - name: install lm-sensors and i7z
+    apt:
+      name:
+      - lm-sensors
+      - i7z
+
+  - name: load modules for lm-sensors
+    vars:
+      sensors_modules:
+      - coretemp
+      - w83627ehf
+    block:
+    - name: load special modules for lm-sensors
+      loop: "{{ sensors_modules }}"
+      modprobe:
+        name: "{{ item }}"
+        state: present
+
+    - name: make sure sensor modules are loaded on reboot
+      copy:
+        content: |
+          # Ansible managed
+
+          {% for module in sensors_modules %}
+          {{ module }}
+          {% endfor %}
+        dest: /etc/modules-load.d/sensors.conf