diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2024-04-01 22:31:52 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2024-04-01 22:31:52 +0200 |
| commit | 053192098a73d454199b4a73cc9de0eb90fd73c6 (patch) | |
| tree | 829a31cb7b82ef7e20ddc06c86050aed6d415e83 | |
| parent | mpv-headless: add simple ssh control interface (diff) | |
ele-companion-raspi: move to lan (mixer vlan is now tagged)
| -rw-r--r-- | dan/ele-companion-raspi.yml | 18 | ||||
| -rw-r--r-- | inventory/group_vars/elevate-festival/vars.yml | 1 | ||||
| -rw-r--r-- | inventory/host_vars/ele-companion-raspi.yml | 6 | ||||
| -rw-r--r-- | roles/raspios/image/templates/firstrun.sh.j2 | 2 |
4 files changed, 24 insertions, 3 deletions
diff --git a/dan/ele-companion-raspi.yml b/dan/ele-companion-raspi.yml index 83ff46e5..e8ab62e6 100644 --- a/dan/ele-companion-raspi.yml +++ b/dan/ele-companion-raspi.yml @@ -15,3 +15,21 @@ - role: kubernetes/base - role: kubernetes/standalone/base - role: streaming/companion + post_tasks: + - name: install vlan package + apt: + name: vlan + state: present + + ## TODO: this should be moved to a generac interfaces role... + - name: add vlan config for mixer vlan + blockinfile: + path: /etc/network/interfaces + block: | + + auto {{ network.primary.name }}.{{ network_zones.mixer.vlan }} + iface {{ network.primary.name }}.{{ network_zones.mixer.vlan }} inet static + up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra + up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf + address {{ network_zones.mixer.prefix | ansible.utils.ipaddr(network_zones.mixer.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }} + netmask {{ network_zones.mixer.prefix | ansible.utils.ipaddr(network_zones.mixer.offsets[inventory_hostname]) | ansible.utils.ipaddr('netmask') }} diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index 9d87a9ed..7b748b89 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -27,6 +27,7 @@ network_zones: ele-hpws-mini2: 213 ele-stage-raspi: 220 ele-orpheum: 240 + ele-companion-raspi: 242 tricaster: 245 datacop: 249 equinox-t450s: 250 diff --git a/inventory/host_vars/ele-companion-raspi.yml b/inventory/host_vars/ele-companion-raspi.yml index cbfd8e2f..72537079 100644 --- a/inventory/host_vars/ele-companion-raspi.yml +++ b/inventory/host_vars/ele-companion-raspi.yml @@ -3,12 +3,12 @@ raspios_variant: lite raspios_arch: arm64 network: - nameservers: "{{ network_zones.mixer.dns }}" + nameservers: "{{ network_zones.lan.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 }}" + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ diff --git a/roles/raspios/image/templates/firstrun.sh.j2 b/roles/raspios/image/templates/firstrun.sh.j2 index 4d3978c8..bc35b764 100644 --- a/roles/raspios/image/templates/firstrun.sh.j2 +++ b/roles/raspios/image/templates/firstrun.sh.j2 @@ -48,6 +48,8 @@ auto {{ network.primary.name }} iface {{ network.primary.name }} inet dhcp {% else %} iface {{ network.primary.name }} inet static + up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/accept_ra + up echo 0 > /proc/sys/net/ipv6/conf/$IFACE/autoconf address {{ network.primary.address | ansible.utils.ipaddr('address') }} netmask {{ network.primary.address | ansible.utils.ipaddr('netmask') }} gateway {{ network.primary.gateway }} |