From 2940fb38e0f3ee26e6ce103a72e290f8e46daeca Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 16 Mar 2024 23:00:00 +0100 Subject: ele-router-hmtsaal: add NAT for mixer vlan ele-companion-raspi: base deployment --- dan/ele-companion-raspi.yml | 17 ++++++++++ inventory/group_vars/elevate-festival/vars.yml | 7 +++-- inventory/host_vars/ele-companion-raspi.yml | 43 ++++++++++++++++++++++++++ inventory/host_vars/ele-router-hmtsaal.yml | 4 +-- inventory/hosts.ini | 3 ++ 5 files changed, 69 insertions(+), 5 deletions(-) create mode 100644 dan/ele-companion-raspi.yml create mode 100644 inventory/host_vars/ele-companion-raspi.yml diff --git a/dan/ele-companion-raspi.yml b/dan/ele-companion-raspi.yml new file mode 100644 index 00000000..83ff46e5 --- /dev/null +++ b/dan/ele-companion-raspi.yml @@ -0,0 +1,17 @@ +--- +- name: Basic Setup + hosts: ele-companion-raspi + roles: + - role: apt-repo/base + - role: core/base + - role: core/sshd/base + - role: core/zsh + - role: core/ntp + +- name: Payload Setup + hosts: ele-companion-raspi + roles: + - role: apt-repo/spreadspace + - role: kubernetes/base + - role: kubernetes/standalone/base + - role: streaming/companion diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index ad09738a..9d87a9ed 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -193,12 +193,13 @@ network_zones: description: "video and audio mixer control interfaces" vlan: 48 prefix: 192.168.48.0/24 - gateway: 192.168.48.254 + gateway: 192.168.48.253 dns: - - 192.168.48.254 + - 192.168.48.253 offsets: + ele-hyperion: 26 ele-ymir: 27 - companion: 42 + ele-companion-raspi: 42 kuschelbaer: 48 mr-snuggles: 49 atem-datacop: 90 diff --git a/inventory/host_vars/ele-companion-raspi.yml b/inventory/host_vars/ele-companion-raspi.yml new file mode 100644 index 00000000..cbfd8e2f --- /dev/null +++ b/inventory/host_vars/ele-companion-raspi.yml @@ -0,0 +1,43 @@ +--- +raspios_variant: lite +raspios_arch: arm64 + +network: + nameservers: "{{ network_zones.mixer.dns }}" + domain: "{{ host_domain }}" + primary: &_network_primary_ + name: eth0 + address: "{{ network_zones.mixer.prefix | ansible.utils.ipaddr(network_zones.mixer.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.mixer.gateway }}" + interfaces: + - *_network_primary_ + +raspios_boot_config: + - regexp: '^#?dtoverlay=disable-bt' + line: 'dtoverlay=disable-bt' + - regexp: '^#?dtoverlay=disable-wifi' + line: 'dtoverlay=disable-wifi' + +base_entropy_generator: rngd + + +spreadspace_apt_repo_components: + - container + + +docker_pkg_provider: docker-com +docker_plugins: + - buildx + +kubernetes_version: 1.29.2 +kubernetes_container_runtime: docker +kubernetes_standalone_max_pods: 42 +kubernetes_standalone_cni_variant: with-portmap +kubernetes_standalone_install_kubeletctl: no + + +companion_storage: + type: directory + dest: /srv/companion + +companion_version: 3.2.2 diff --git a/inventory/host_vars/ele-router-hmtsaal.yml b/inventory/host_vars/ele-router-hmtsaal.yml index 426e4c02..e5ab11a6 100644 --- a/inventory/host_vars/ele-router-hmtsaal.yml +++ b/inventory/host_vars/ele-router-hmtsaal.yml @@ -293,12 +293,12 @@ openwrt_mixin: chain forward { type filter hook forward priority filter; policy drop; ct state vmap { established: accept, related: accept, invalid: drop } - iifname { {{ ['$nic_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_citycom accept + iifname { {{ ['$nic_'] | product(network_internal_zone_names | union(['mixer'])) | map('join') | join(', ') }} } oifname $nic_citycom accept } chain postrouting { type nat hook postrouting priority srcnat; policy accept; - ip saddr { {{ ['$prefix_'] | product(network_internal_zone_names) | map('join') | join(', ') }} } oifname $nic_citycom snat to $ip_citycom + ip saddr { {{ ['$prefix_'] | product(network_internal_zone_names | union(['mixer'])) | map('join') | join(', ') }} } oifname $nic_citycom snat to $ip_citycom } } diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 306030c6..376ec48e 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -235,6 +235,7 @@ ele-jitsi ele-winvm ele-testvm ele-stage-raspi +ele-companion-raspi [elevate:children] ele-ap @@ -353,6 +354,7 @@ ch-octopi ch-epimetheus ch-companion-raspi ele-stage-raspi +ele-companion-raspi [raspios:children] dolmetsch-raspi @@ -617,6 +619,7 @@ glt-thetys sk-testvm ch-testvm-prometheus ch-companion-raspi +ele-companion-raspi [kubernetes:children] kubernetes-cluster -- cgit v1.2.3