From ddc42fe6b398b89ebdbccf7ce4940b5f9829cad7 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 13 Aug 2021 21:13:46 +0200 Subject: fix blackmagic apt repo keyring --- inventory/group_vars/chaos-at-home/network.yml | 6 ++-- inventory/host_vars/ch-dione.yml | 39 +++++++++++++------------- inventory/host_vars/ch-helene.yml | 35 +++++++++++------------ 3 files changed, 41 insertions(+), 39 deletions(-) (limited to 'inventory') 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 -- cgit v1.2.3