diff options
-rw-r--r-- | inventory/group_vars/elevate-festival/vars.yml | 5 | ||||
-rw-r--r-- | inventory/host_vars/ele-calypso.yml | 3 | ||||
-rw-r--r-- | inventory/host_vars/ele-dione.yml | 10 | ||||
-rw-r--r-- | inventory/host_vars/ele-telesto.yml | 10 |
4 files changed, 17 insertions, 11 deletions
diff --git a/inventory/group_vars/elevate-festival/vars.yml b/inventory/group_vars/elevate-festival/vars.yml index ec5e038a..189f36e5 100644 --- a/inventory/group_vars/elevate-festival/vars.yml +++ b/inventory/group_vars/elevate-festival/vars.yml @@ -33,7 +33,7 @@ network_zones: key: "{{ vault_wifi_keys.lan }}" emc: - description: "internet via wireguard tunnel to Hetzner VM, reserved for streams" + description: "internet uplink reserved for streams and remote guests" vlan: 20 prefix: 192.168.20.0/24 gateway: 192.168.20.254 @@ -44,6 +44,9 @@ network_zones: limit: 199 offsets: ele-helene: 201 + ele-calypso: 203 + ele-dione: 204 + ele-telesto: 205 ele-tsdatacop: 210 ele-hpws-maxi: 211 ele-hpws-mini1: 212 diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml index 9816edb7..7047cd2a 100644 --- a/inventory/host_vars/ele-calypso.yml +++ b/inventory/host_vars/ele-calypso.yml @@ -16,9 +16,12 @@ network: - *_network_primary_ - name: "enp3s0.{{ network_zones.mgmt.vlan }}" address: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets[inventory_hostname]) }}" + - name: "enp3s0.{{ network_zones.emc.vlan }}" + address: "{{ network_zones.emc.prefix | ansible.utils.ipaddr(network_zones.emc.offsets[inventory_hostname]) }}" vlans: enp3s0: - "{{ network_zones.mgmt.vlan }}" + - "{{ network_zones.emc.vlan }}" apt_repo_components: diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index 2e393bc2..3e68a625 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -9,12 +9,12 @@ install: - "drm.edid_firmware=edid/1280x1024.bin" network: - nameservers: "{{ network_zones.lan.dns }}" + nameservers: "{{ network_zones.emc.dns }}" domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.lan.gateway }}" + address: "{{ network_zones.emc.prefix | ansible.utils.ipaddr(network_zones.emc.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.emc.gateway }}" interfaces: - *_network_primary_ @@ -53,7 +53,7 @@ ntp_variant: chrony ntp_client: servers: - - name: "{{ network_zones.lan.gateway }}" + - name: "{{ network_zones.emc.gateway }}" options: iburst @@ -94,5 +94,5 @@ prometheus_exporter_ipmi_modules: prometheus_job_multitarget_blackbox__probe: ele-calypso: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.emc.prefix | ansible.utils.ipaddr(network_zones.emc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml index a92f801f..25f2a35e 100644 --- a/inventory/host_vars/ele-telesto.yml +++ b/inventory/host_vars/ele-telesto.yml @@ -6,12 +6,12 @@ install: primary: /dev/disk/by-id/nvme-Samsung_SSD_970_PRO_512GB_S5JYNC0N310329Z network: - nameservers: "{{ network_zones.lan.dns }}" + nameservers: "{{ network_zones.emc.dns }}" domain: "{{ host_domain }}" primary: &_network_primary_ name: enp35s0 - address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" - gateway: "{{ network_zones.lan.gateway }}" + address: "{{ network_zones.emc.prefix | ansible.utils.ipaddr(network_zones.emc.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.emc.gateway }}" interfaces: - *_network_primary_ @@ -49,7 +49,7 @@ ntp_variant: chrony ntp_client: servers: - - name: "{{ network_zones.lan.gateway }}" + - name: "{{ network_zones.emc.gateway }}" options: iburst @@ -80,5 +80,5 @@ prometheus_exporter_ipmi_modules: prometheus_job_multitarget_blackbox__probe: ele-calypso: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.emc.prefix | ansible.utils.ipaddr(network_zones.emc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner |