add config for glt-helene and glt-dione

14 files changed, 247 insertions, 18 deletions

diff --git a/chaos-at-home/ch-calypso.yml b/chaos-at-home/ch-calypso.yml
index 55246bb2..632132c8 100644
--- a/chaos-at-home/ch-calypso.yml
+++ b/chaos-at-home/ch-calypso.yml
@@ -6,6 +6,7 @@
   - role: core/base
   - role: core/sshd
   - role: core/zsh
+  - role: core/ntp
   - role: core/cpu-microcode
   - role: zfs/base
   - role: apt-repo/obs-studio
@@ -33,7 +34,7 @@
         name: "{{ item }}"
         state: present
 
-    - name: make sure module is loaded on reboot
+    - name: make sure sensor modules are loaded on reboot
       copy:
         content: |
           # Ansible managed
diff --git a/chaos-at-home/ch-dione.yml b/chaos-at-home/ch-dione.yml
index 1aab9e14..f69ef194 100644
--- a/chaos-at-home/ch-dione.yml
+++ b/chaos-at-home/ch-dione.yml
@@ -6,8 +6,8 @@
   - role: core/base
   - role: core/sshd
   - role: core/zsh
-  - role: core/cpu-microcode
   - role: core/ntp
+  - role: core/cpu-microcode
   - role: core/admin-users
   - role: apt-repo/spreadspace
   - role: streaming/blackmagic/desktopvideo
@@ -29,7 +29,7 @@
         name: "{{ item }}"
         state: present
 
-    - name: make sure module is loaded on reboot
+    - name: make sure sensor modules are loaded on reboot
       copy:
         content: |
           # Ansible managed
diff --git a/chaos-at-home/ch-helene.yml b/chaos-at-home/ch-helene.yml
index a87e78bc..893971a5 100644
--- a/chaos-at-home/ch-helene.yml
+++ b/chaos-at-home/ch-helene.yml
@@ -6,8 +6,8 @@
   - role: core/base
   - role: core/sshd
   - role: core/zsh
-  - role: core/cpu-microcode
   - role: core/ntp
+  - role: core/cpu-microcode
   - role: core/admin-users
   - role: apt-repo/spreadspace
   - role: streaming/blackmagic/desktopvideo
@@ -29,7 +29,7 @@
         name: "{{ item }}"
         state: present
 
-    - name: make sure module is loaded on reboot
+    - name: make sure sensor modules are loaded on reboot
       copy:
         content: |
           # Ansible managed
diff --git a/chaos-at-home/ch-telesto.yml b/chaos-at-home/ch-telesto.yml
index a3ab6126..68d9595d 100644
--- a/chaos-at-home/ch-telesto.yml
+++ b/chaos-at-home/ch-telesto.yml
@@ -6,6 +6,7 @@
   - role: core/base
   - role: core/sshd
   - role: core/zsh
+  - role: core/ntp
   - role: core/cpu-microcode
   - role: zfs/base
   - role: apt-repo/obs-studio
@@ -33,7 +34,7 @@
         name: "{{ item }}"
         state: present
 
-    - name: make sure module is loaded on reboot
+    - name: make sure sensor modules are loaded on reboot
       copy:
         content: |
           # Ansible managed
diff --git a/chaos-at-home/ch-thetys.yml b/chaos-at-home/ch-thetys.yml
index 01cb9cca..5469add6 100644
--- a/chaos-at-home/ch-thetys.yml
+++ b/chaos-at-home/ch-thetys.yml
@@ -6,6 +6,7 @@
   - role: core/base
   - role: core/sshd
   - role: core/zsh
+  - role: core/ntp
   - role: core/cpu-microcode
   - role: core/admin-users
   - role: apt-repo/spreadspace
@@ -32,7 +33,7 @@
         name: "{{ item }}"
         state: present
 
-    - name: make sure module is loaded on reboot
+    - name: make sure sensor modules are loaded on reboot
       copy:
         content: |
           # Ansible managed
diff --git a/inventory/group_vars/glt-live-r3.yml b/inventory/group_vars/glt-live-r3.yml
new file mode 100644
index 00000000..8c360f8d
--- /dev/null
+++ b/inventory/group_vars/glt-live-r3.yml
@@ -0,0 +1,3 @@
+---
+apt_repo_provider: anexia
+#apt_repo_provider: ffgraz
diff --git a/inventory/group_vars/glt-live/network.yml b/inventory/group_vars/glt-live/network.yml
index 70d269f3..1a1a42ca 100644
--- a/inventory/group_vars/glt-live/network.yml
+++ b/inventory/group_vars/glt-live/network.yml
@@ -6,7 +6,8 @@ network_zones:
     prefix: 192.168.127.0/24
     gateway: 192.168.127.254
     dns:
-    - 192.168.127.254
+    #- 192.168.127.254
+    - 9.9.9.9
     dhcp:
       start: 1
       limit: 149
diff --git a/inventory/group_vars/glt-live/vars.yml b/inventory/group_vars/glt-live/vars.yml
index df4e80ad..c8d903c1 100644
--- a/inventory/group_vars/glt-live/vars.yml
+++ b/inventory/group_vars/glt-live/vars.yml
@@ -24,5 +24,5 @@ install:
 network: {}
 
 apt_repo_blackmagic_auth:
-  username: "spreadspace"
+  username: "glt"
   password: "{{ vault_apt_repo_blackmagic_auth.password }}"
diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml
new file mode 100644
index 00000000..3200c315
--- /dev/null
+++ b/inventory/host_vars/glt-dione.yml
@@ -0,0 +1,65 @@
+---
+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"
+
+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-helene.yml b/inventory/host_vars/glt-helene.yml
new file mode 100644
index 00000000..87472a62
--- /dev/null
+++ b/inventory/host_vars/glt-helene.yml
@@ -0,0 +1,65 @@
+---
+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"
+
+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/hosts.ini b/inventory/hosts.ini
index 919a687e..5a788cf4 100644
--- a/inventory/hosts.ini
+++ b/inventory/hosts.ini
@@ -145,6 +145,8 @@ glt-live-tug
 
 [glt-live-r3]
 glt-gw-r3 host_name=gw-r3
+glt-dione host_name=dione
+glt-helene host_name=helene
 
 [glt-live-tug]
 glt-gw-tug host_name=gw-tug
@@ -428,6 +430,8 @@ s2-thetys
 sk-tomnext-nc
 ch-thetys
 glt-coturn
+glt-dione
+glt-helene
 
 [kubernetes:children]
 kubernetes-cluster
diff --git a/spreadspace/glt-dione.yml b/spreadspace/glt-dione.yml
new file mode 100644
index 00000000..a13799b5
--- /dev/null
+++ b/spreadspace/glt-dione.yml
@@ -0,0 +1,42 @@
+---
+- name: Basic Setup
+  hosts: glt-dione
+  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
+    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-helene.yml b/spreadspace/glt-helene.yml
new file mode 100644
index 00000000..13b3aeac
--- /dev/null
+++ b/spreadspace/glt-helene.yml
@@ -0,0 +1,42 @@
+---
+- name: Basic Setup
+  hosts: glt-helene
+  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
+    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/group_vars/glt-live.yml b/spreadspace/group_vars/glt-live.yml
index 59924bba..ab299151 100644
--- a/spreadspace/group_vars/glt-live.yml
+++ b/spreadspace/group_vars/glt-live.yml
@@ -1,10 +1,14 @@
 $ANSIBLE_VAULT;1.2;AES256;spreadspace
-30363032353531613732386332346431623532356466353765633939656635353835353930376561
-6537383665376330653366313635396134376464383462380a376530623330343934363738316565
-37336134663631303061623438346631306562386564386531623536313063386137326635663637
-3131653239393838390a623838333532663938643361333931343534663331396231393434656363
-66656536653534303835663732346563653662313164323333643939616330653861636439666461
-65326163656439306339383338623337643535653331343737663936666132656233353236343331
-32646132623334343264336131323138383231613831303735633237323463663638343639346638
-39336339326266363133326638646438313665346635663836356334616564643132373633386232
-6431
+38643838613730663635376536663830656363333938613762626664623433653562343136373937
+6530343131383835363835353065393165613831343334310a633965623230333430353831393661
+36336663663564383536383939623965363063616366646465663234376631323638643130643030
+6436383635373632620a646439363339353565306164326339383864343731616131373632313630
+66633263396262356264646534353535383533386633373035653462353064353131323237326136
+30396162386365306362396430313064343935373535386237616631626437333263303832653562
+63626561653031326635343230383131646163626661393439313732386232623661653335656537
+61393236323663363038653231393937643464666463633562383034356337643135633832306636
+30636564313966383037396135323062336435336434313735616334616261363137336165663237
+66303636616664623134623035313530393437396165396330383232346265386537316238343662
+39636236626536326636366234663430616536643264623236656630633030623332373436646433
+61643763396132313035616339346435646235666232353864323564376461613532363137353862
+3830