diff options
Diffstat (limited to 'inventory/host_vars')
27 files changed, 64 insertions, 64 deletions
diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml index 52ec069a..04ea9e0f 100644 --- a/inventory/host_vars/ch-apps.yml +++ b/inventory/host_vars/ch-apps.yml @@ -36,11 +36,11 @@ network: interfaces: "{{ install.interfaces }}" primary: &_network_primary_ name: svc0 - address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.svc.gateway }}" static_routes: - destination: "{{ network_zones.lan.prefix }}" - gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}" + gateway: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ansible.utils.ipaddr('address') }}" interfaces: - *_network_primary_ @@ -61,7 +61,7 @@ ssh_keys_root_extra: prometheus_job_multitarget_blackbox__probe: ch-mon: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner diff --git a/inventory/host_vars/ch-calypso.yml b/inventory/host_vars/ch-calypso.yml index 60257cfd..163b63e4 100644 --- a/inventory/host_vars/ch-calypso.yml +++ b/inventory/host_vars/ch-calypso.yml @@ -35,7 +35,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + 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/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index a7766e6e..73b6cc56 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -13,7 +13,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + 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/inventory/host_vars/ch-gw-lan.yml b/inventory/host_vars/ch-gw-lan.yml index 2aa27ab0..ee6a6c38 100644 --- a/inventory/host_vars/ch-gw-lan.yml +++ b/inventory/host_vars/ch-gw-lan.yml @@ -27,12 +27,12 @@ network: interfaces: "{{ install.interfaces }}" primary: &_network_primary_ name: svc0 - address: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.svc.gateway }}" interfaces: - *_network_primary_ - name: lan0 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" base_sysctl_config_user: @@ -52,19 +52,19 @@ dhcp_server_interfaces: nftables_base_rules: public-services: | define nic_lan = lan0 - define public_ipv4 = {{ network_zones.magenta.prefix | ipaddr(network_zones.magenta.offsets['ch-router']) | ipaddr('address') }} + define public_ipv4 = {{ network_zones.magenta.prefix | ansible.utils.ipaddr(network_zones.magenta.offsets['ch-router']) | ansible.utils.ipaddr('address') }} table ip nat { chain public-services-prerouting { type nat hook prerouting priority -100; policy accept; - iif $nic_lan ip daddr $public_ipv4 tcp dport { 222 } dnat to {{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-router']) | ipaddr('address') }} comment "ssh-router" + iif $nic_lan ip daddr $public_ipv4 tcp dport { 222 } dnat to {{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-router']) | ansible.utils.ipaddr('address') }} comment "ssh-router" {% for name, svc in network_services.items() %} iif $nic_lan ip daddr $public_ipv4 tcp dport { {{ svc.ports | join(', ') }} } dnat to {{ svc.addr }} comment "{{ name }}" {% endfor %} } chain public-services-output { type nat hook output priority -100; policy accept; - ip daddr $public_ipv4 tcp dport { 222 } dnat to {{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-router']) | ipaddr('address') }} comment "ssh-router" + ip daddr $public_ipv4 tcp dport { 222 } dnat to {{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-router']) | ansible.utils.ipaddr('address') }} comment "ssh-router" {% for name, svc in network_services.items() %} ip daddr $public_ipv4 tcp dport { {{ svc.ports | join(', ') }} } dnat to {{ svc.addr }} comment "{{ name }}" {% endfor %} diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index a4042eea..a8a1c63f 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -13,7 +13,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + 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/inventory/host_vars/ch-hpws-maxi.yml b/inventory/host_vars/ch-hpws-maxi.yml index c5637069..0294bc19 100644 --- a/inventory/host_vars/ch-hpws-maxi.yml +++ b/inventory/host_vars/ch-hpws-maxi.yml @@ -36,7 +36,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + 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/inventory/host_vars/ch-hpws-mini1.yml b/inventory/host_vars/ch-hpws-mini1.yml index bb51be47..9948c400 100644 --- a/inventory/host_vars/ch-hpws-mini1.yml +++ b/inventory/host_vars/ch-hpws-mini1.yml @@ -36,7 +36,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + 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/inventory/host_vars/ch-installsmb.yml b/inventory/host_vars/ch-installsmb.yml index 9b673bea..bfe4de96 100644 --- a/inventory/host_vars/ch-installsmb.yml +++ b/inventory/host_vars/ch-installsmb.yml @@ -107,8 +107,8 @@ openwrt_uci: options: device: eth0 proto: static - ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr('netmask') }}" samba4: - name: samba diff --git a/inventory/host_vars/ch-phoebe.yml b/inventory/host_vars/ch-phoebe.yml index e9dca5be..cca07f82 100644 --- a/inventory/host_vars/ch-phoebe.yml +++ b/inventory/host_vars/ch-phoebe.yml @@ -14,7 +14,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: br-lan - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ @@ -71,7 +71,7 @@ prometheus_exporter_ipmi_modules: prometheus_job_multitarget_blackbox__probe: ch-mon: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner prometheus_job_multitarget_ssl__probe: diff --git a/inventory/host_vars/ch-prometheus-legacy.yml b/inventory/host_vars/ch-prometheus-legacy.yml index afab98c0..2eb2858f 100644 --- a/inventory/host_vars/ch-prometheus-legacy.yml +++ b/inventory/host_vars/ch-prometheus-legacy.yml @@ -37,7 +37,7 @@ network: interfaces: "{{ install.interfaces }}" primary: &_network_primary_ name: eth0 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + 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/inventory/host_vars/ch-prometheus.yml b/inventory/host_vars/ch-prometheus.yml index 55f68ec0..3d716674 100644 --- a/inventory/host_vars/ch-prometheus.yml +++ b/inventory/host_vars/ch-prometheus.yml @@ -19,7 +19,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: br-lan - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ @@ -67,7 +67,7 @@ prometheus_exporter_ipmi_modules: prometheus_job_multitarget_blackbox__probe: ch-mon: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner prometheus_job_multitarget_ssl__probe: diff --git a/inventory/host_vars/ch-telesto.yml b/inventory/host_vars/ch-telesto.yml index e2ce5d02..343710ef 100644 --- a/inventory/host_vars/ch-telesto.yml +++ b/inventory/host_vars/ch-telesto.yml @@ -35,7 +35,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + 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/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml index 6b11b7ae..b4627d94 100644 --- a/inventory/host_vars/ele-calypso.yml +++ b/inventory/host_vars/ele-calypso.yml @@ -10,12 +10,12 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ - name: "enp3s0.{{ network_zones.mgmt.vlan }}" - address: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets[inventory_hostname]) }}" vlans: enp3s0: - "{{ network_zones.mgmt.vlan }}" @@ -72,7 +72,7 @@ kubernetes_standalone_cni_variant: with-portmap player_inst_name: emc-feed player_ffmpeg_image_version: bullseye-decklink11.7-2022-06-12.26 -#player_input: [ '-f', 'live_flv', '-rtmp_live', 'live', '-i', "rtmp://{{ network_zones.cc_leslie.prefix | ipaddr(network_zones.cc_leslie.offsets['ele-thetys']) | ipaddr('address') }}/emc-feed/full" ] +#player_input: [ '-f', 'live_flv', '-rtmp_live', 'live', '-i', "rtmp://{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets['ele-thetys']) | ansible.utils.ipaddr('address') }}/emc-feed/full" ] player_input: [ '-stream_loop', '-1', '-i', '/srv/videos/Big Buck Bunny 1080p 60fps.mp4' ] player_output: [ '-ac', '2', '-pix_fmt', 'uyvy422', '-s', '1920x1080' ,'-r', '50','-f', 'decklink', 'DeckLink Duo (2)' ] player_volume_mounts: @@ -92,7 +92,7 @@ prometheus_server_alertmanager: url: "127.0.0.1:9093" path_prefix: "/alertmanager/" -prometheus_server_web_external_url: "http://{{ network.primary.address | ipaddr('address') }}/prometheus/" +prometheus_server_web_external_url: "http://{{ network.primary.address | ansible.utils.ipaddr('address') }}/prometheus/" prometheus_exporters_extra: @@ -111,11 +111,11 @@ prometheus_exporter_blackbox_modules_extra: prometheus_job_multitarget_blackbox__probe: ele-calypso: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner -prometheus_alertmanager_web_external_url: "http://{{ network.primary.address | ipaddr('address') }}/alertmanager/" +prometheus_alertmanager_web_external_url: "http://{{ network.primary.address | ansible.utils.ipaddr('address') }}/alertmanager/" prometheus_alertmanager_smtp: smarthost: "mailrelay.chaos-at-home.org:587" from: "noreply@elev8.at" diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml index 6e0087c8..2b9d57ce 100644 --- a/inventory/host_vars/ele-dione.yml +++ b/inventory/host_vars/ele-dione.yml @@ -13,7 +13,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ @@ -53,7 +53,7 @@ ntp_variant: chrony ntp_client: servers: - - name: "{{ kubeguard.direct_net_zones.encoder.transfer_net | ipaddr(kubeguard.node_index['ele-telesto']) | ipaddr('address') }}" + - name: "{{ kubeguard.direct_net_zones.encoder.transfer_net | ansible.utils.ipaddr(kubeguard.node_index['ele-telesto']) | ansible.utils.ipaddr('address') }}" options: iburst minpoll 1 maxpoll 3 polltarget 30 ntp_hwtimestamp_interfaces: @@ -98,5 +98,5 @@ prometheus_exporter_ipmi_modules: prometheus_job_multitarget_blackbox__probe: ele-calypso: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index 602075a3..e3528c5c 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -13,7 +13,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.lan.gateway }}" interfaces: - *_network_primary_ @@ -66,7 +66,7 @@ prometheus_exporter_ipmi_modules: prometheus_job_multitarget_blackbox__probe: ele-calypso: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.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 786d6619..ca776d92 100644 --- a/inventory/host_vars/ele-telesto.yml +++ b/inventory/host_vars/ele-telesto.yml @@ -14,7 +14,7 @@ network: name: enp35s0 address: "192.168.28.3/24" gateway: "192.168.28.254" -# address: "{{ network_zones.cc_hmtsaal.prefix | ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" +# address: "{{ network_zones.cc_hmtsaal.prefix | ansible.utils.ipaddr(network_zones.cc_hmtsaal.offsets[inventory_hostname]) }}" # gateway: "{{ network_zones.cc_hmtsaal.gateway }}" interfaces: - *_network_primary_ @@ -93,5 +93,5 @@ prometheus_exporter_ipmi_modules: prometheus_job_multitarget_blackbox__probe: ele-calypso: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 3811a578..ab236d47 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -12,7 +12,7 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.cc_leslie.prefix | ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" + address: "{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) }}" gateway: "{{ network_zones.cc_leslie.gateway }}" interfaces: - *_network_primary_ @@ -54,7 +54,7 @@ prometheus_exporter_node_textfile_collector_scripts: prometheus_job_multitarget_blackbox__probe: ele-calypso: - instance: "ssh-{{ inventory_hostname }}" - target: "{{ network_zones.cc_leslie.prefix | ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ipaddr('address') }}:{{ ansible_port | default(22) }}" + target: "{{ network_zones.cc_leslie.prefix | ansible.utils.ipaddr(network_zones.cc_leslie.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}" module: ssh_banner diff --git a/inventory/host_vars/ele-tub.yml b/inventory/host_vars/ele-tub.yml index aef83dc5..46d165e8 100644 --- a/inventory/host_vars/ele-tub.yml +++ b/inventory/host_vars/ele-tub.yml @@ -124,15 +124,15 @@ openwrt_uci: options: device: eth2 proto: static - ipaddr: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.mgmt.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr('netmask') }}" - name: interface 'ffsubnet' options: device: eth1 proto: static - ipaddr: "{{ network_zones.funkfeuer.prefix | ipaddr(network_zones.funkfeuer.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.funkfeuer.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.funkfeuer.prefix | ansible.utils.ipaddr(network_zones.funkfeuer.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.funkfeuer.prefix | ansible.utils.ipaddr('netmask') }}" - name: interface 'ff' options: @@ -172,8 +172,8 @@ openwrt_uci: - name: Hna4 options: - netaddr: "{{ network_zones.funkfeuer.prefix | ipaddr('network') }}" - netmask: "{{ network_zones.funkfeuer.prefix | ipaddr('netmask') }}" + netaddr: "{{ network_zones.funkfeuer.prefix | ansible.utils.ipaddr('network') }}" + netmask: "{{ network_zones.funkfeuer.prefix | ansible.utils.ipaddr('netmask') }}" prometheus-node-exporter-lua: - name: prometheus-node-exporter-lua 'main' @@ -183,6 +183,6 @@ openwrt_uci: listen_port: '9100' -prometheus_scrape_endpoint: "{{ network_zones.mgmt.prefix | ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ipaddr('address') }}:9100" +prometheus_scrape_endpoint: "{{ network_zones.mgmt.prefix | ansible.utils.ipaddr(network_zones.mgmt.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:9100" prometheus_exporters_default: - openwrt diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index c8922705..a13611d6 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -14,8 +14,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}" + address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" interfaces: - *_network_primary_ diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index a7f107af..22979b43 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -13,8 +13,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}" + address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" interfaces: - *_network_primary_ diff --git a/inventory/host_vars/glt-gw-r3.yml b/inventory/host_vars/glt-gw-r3.yml index b15edfec..d5d8538e 100644 --- a/inventory/host_vars/glt-gw-r3.yml +++ b/inventory/host_vars/glt-gw-r3.yml @@ -129,8 +129,8 @@ openwrt_uci: options: device: eth0 proto: static - ipaddr: "{{ network_zones.r3_ff.prefix | ipaddr(network_zones.r3_ff.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.r3_ff.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.r3_ff.prefix | ansible.utils.ipaddr(network_zones.r3_ff.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.r3_ff.prefix | ansible.utils.ipaddr('netmask') }}" gateway: "{{ network_zones.r3_ff.gateway }}" dns: "{{ network_zones.r3_ff.dns }}" @@ -138,8 +138,8 @@ openwrt_uci: options: device: eth1 proto: static - ipaddr: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.r3_lan.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr('netmask') }}" - name: interface 'unused' options: diff --git a/inventory/host_vars/glt-gw-tug.yml b/inventory/host_vars/glt-gw-tug.yml index d80c4167..5e1d0a45 100644 --- a/inventory/host_vars/glt-gw-tug.yml +++ b/inventory/host_vars/glt-gw-tug.yml @@ -167,8 +167,8 @@ openwrt_uci: type: bridge device: "eth0 eth1 eth2 eth3 eth4" proto: static - ipaddr: "{{ network_zones.tug_lan.prefix | ipaddr(network_zones.tug_lan.offsets[inventory_hostname]) | ipaddr('address') }}" - netmask: "{{ network_zones.tug_lan.prefix | ipaddr('netmask') }}" + ipaddr: "{{ network_zones.tug_lan.prefix | ansible.utils.ipaddr(network_zones.tug_lan.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}" + netmask: "{{ network_zones.tug_lan.prefix | ansible.utils.ipaddr('netmask') }}" - name: interface 'wan' options: diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index f0180acb..3f021161 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -13,8 +13,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}" + address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" interfaces: - *_network_primary_ diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index 0963d8ab..e132e5da 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -14,8 +14,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}" + address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" interfaces: - *_network_primary_ diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index 3543f948..43a3fc11 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -13,8 +13,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}" + address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" interfaces: - *_network_primary_ diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml index 0ded12df..2e53a878 100644 --- a/inventory/host_vars/glt-tsdatacop.yml +++ b/inventory/host_vars/glt-tsdatacop.yml @@ -13,8 +13,8 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: eno1 - address: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ network_zones.r3_lan.prefix | ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ipaddr('address') }}" + address: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets[inventory_hostname]) }}" + gateway: "{{ network_zones.r3_lan.prefix | ansible.utils.ipaddr(network_zones.r3_lan.offsets['glt-gw-r3']) | ansible.utils.ipaddr('address') }}" interfaces: - *_network_primary_ diff --git a/inventory/host_vars/sgg-icecast.yml b/inventory/host_vars/sgg-icecast.yml index ab4b91b1..5d70cb2b 100644 --- a/inventory/host_vars/sgg-icecast.yml +++ b/inventory/host_vars/sgg-icecast.yml @@ -22,10 +22,10 @@ network: interfaces: "{{ install.interfaces }}" primary: &_network_primary_ name: primary0 - address: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) | ipaddr('address/prefix') }}" - gateway: "{{ vm_host.network.bridges.public.prefix | ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ipaddr('address') }}" + address: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[inventory_hostname]) }}" + gateway: "{{ vm_host.network.bridges.public.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.offsets[vm_host.name]) | ansible.utils.ipaddr('address') }}" template: overlay - overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}" + overlay: "{{ (vm_host.network.bridges.public.overlays.default.prefix | ansible.utils.ipaddr(vm_host.network.bridges.public.overlays.default.offsets[inventory_hostname])).split('/')[0] }}" interfaces: - *_network_primary_ |