diff options
| -rw-r--r-- | chaos-at-home/ch-dione.yml | 2 | ||||
| -rw-r--r-- | chaos-at-home/ch-helene.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 6 | ||||
| -rw-r--r-- | inventory/host_vars/ch-dione.yml | 39 | ||||
| -rw-r--r-- | inventory/host_vars/ch-helene.yml | 35 | ||||
| -rw-r--r-- | roles/apt-repo/blackmagic/tasks/main.yml | 11 |
6 files changed, 50 insertions, 45 deletions
diff --git a/chaos-at-home/ch-dione.yml b/chaos-at-home/ch-dione.yml index 7465d38e..3c358470 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/base - role: core/zsh - - role: core/ntp - role: core/cpu-microcode + - role: core/ntp - role: core/admin-users - role: apt-repo/spreadspace - role: streaming/blackmagic/desktopvideo diff --git a/chaos-at-home/ch-helene.yml b/chaos-at-home/ch-helene.yml index 6ceb1c36..40af7c5e 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/base - role: core/zsh - - role: core/ntp - role: core/cpu-microcode + - role: core/ntp - role: core/admin-users - role: apt-repo/spreadspace - role: streaming/blackmagic/desktopvideo diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 67fc8fd6..55142a81 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -6,7 +6,8 @@ network_zones: gateway: 192.168.28.254 dns: # - 192.168.28.254 - - 9.9.9.9 +# - 9.9.9.9 + - 1.1.1.1 dhcp: start: 100 limit: 199 @@ -52,7 +53,8 @@ network_zones: gateway: 192.168.32.254 dns: # - 192.168.32.254 - - 9.9.9.9 +# - 9.9.9.9 + - 1.1.1.1 offsets: ch-apps: 1 ch-http-proxy: 8 diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 072321bf..9e327b21 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -42,6 +42,24 @@ apt_repo_components: - non-free ## for microcode updates +admin_users_host: + - equinox + +containerd_storage: + type: lvm + vg: "{{ host_name }}" + lv: containerd + size: 15G + fs: ext4 + +kubelet_storage: + type: lvm + vg: "{{ host_name }}" + lv: kubelet + size: 10G + fs: ext4 + + ntp_variant: chrony ntp_client: @@ -53,27 +71,10 @@ ntp_hwtimestamp_interfaces: - name: "*" ntp_server: + local: stratum 8 allow: - "{{ network_zones.lan.prefix }}" -admin_users_host: - - equinox - - blackmagic_desktopvideo_version: 11.7a12 - - -docker_storage: - type: lvm - vg: "{{ host_name }}" - lv: docker - size: 15G - fs: ext4 - -kubelet_storage: - type: lvm - vg: "{{ host_name }}" - lv: kubelet - size: 10G - fs: ext4 +blackmagic_desktopvideo_include_gui: yes diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index 99ec0593..2b511ce6 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -41,29 +41,13 @@ apt_repo_components: - contrib - non-free ## for microcode updates - -ntp_variant: chrony - -ntp_client: - servers: - - name: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-dione']) | ipaddr('address') }}" - options: iburst minpoll 1 maxpoll 3 polltarget 30 - -ntp_hwtimestamp_interfaces: - - name: "*" - - admin_users_host: - equinox - -blackmagic_desktopvideo_version: 11.7a12 - - -docker_storage: +containerd_storage: type: lvm vg: "{{ host_name }}" - lv: docker + lv: containerd size: 15G fs: ext4 @@ -73,3 +57,18 @@ kubelet_storage: lv: kubelet size: 10G fs: ext4 + + +ntp_variant: chrony + +ntp_client: + servers: + - name: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-dione']) | ipaddr('address') }}" + options: iburst minpoll 1 maxpoll 3 polltarget 30 + +ntp_hwtimestamp_interfaces: + - name: "*" + + +blackmagic_desktopvideo_version: 11.7a12 +blackmagic_desktopvideo_include_gui: yes diff --git a/roles/apt-repo/blackmagic/tasks/main.yml b/roles/apt-repo/blackmagic/tasks/main.yml index 0a63a094..8cbf3279 100644 --- a/roles/apt-repo/blackmagic/tasks/main.yml +++ b/roles/apt-repo/blackmagic/tasks/main.yml @@ -2,13 +2,16 @@ - name: install repo key copy: src: repo.gpg - dest: /etc/apt/keyrings/blackmagic.gpg + dest: /etc/apt/keyrings/spreadspace.gpg register: apt_repo_blackmagic_key ## TODO: remove once all servers have been converted -- name: remove repository key from old location +- name: remove repository key from old locations + loop: + - /etc/apt/trusted.gpg.d/blackmagic.gpg + - /etc/apt/keyrings/blackmagic.gpg file: - path: /etc/apt/trusted.gpg.d/blackmagic.gpg + path: "{{ item }}" state: absent @@ -49,7 +52,7 @@ - name: add repository entry copy: content: | - deb [signed-by=/etc/apt/keyrings/blackmagic.gpg] https://build.spreadspace.org/ {{ ansible_distribution_release }} blackmagic + deb [signed-by=/etc/apt/keyrings/spreadspace.gpg] https://build.spreadspace.org/ {{ ansible_distribution_release }} blackmagic dest: /etc/apt/sources.list.d/blackmagic.list register: apt_repo_blackmagic_sources |