diff options
| -rw-r--r-- | chaos-at-home/ch-equinox-ws.yml | 2 | ||||
| -rw-r--r-- | chaos-at-home/ch-http-proxy.yml | 6 | ||||
| -rw-r--r-- | chaos-at-home/ch-mc.yml | 2 | ||||
| -rw-r--r-- | dan/ele-emcplayer.yml | 2 | ||||
| -rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 6 | ||||
| -rw-r--r-- | inventory/host_vars/ch-equinox-ws.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-http-proxy.yml | 4 | ||||
| -rw-r--r-- | inventory/host_vars/ch-imap-proxy.yml | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml index e70091cf..433ed78f 100644 --- a/chaos-at-home/ch-equinox-ws.yml +++ b/chaos-at-home/ch-equinox-ws.yml @@ -29,7 +29,7 @@ - name: mount fileserver volumes mount: - src: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-prometheus']) | ipaddr('address') }}:/" + src: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ch-prometheus']) | ansible.utils.ipaddr('address') }}:/" path: /srv/files fstype: nfs4 opts: nodev,x-systemd.automount,nofail diff --git a/chaos-at-home/ch-http-proxy.yml b/chaos-at-home/ch-http-proxy.yml index a969dbc0..dc362aa4 100644 --- a/chaos-at-home/ch-http-proxy.yml +++ b/chaos-at-home/ch-http-proxy.yml @@ -113,7 +113,7 @@ - passwd.chaos-at-home.org locations: '/': - proxy_pass: "https://{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-auth-legacy']) | ipaddr('address') }}/" + proxy_pass: "https://{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-auth-legacy']) | ansible.utils.ipaddr('address') }}/" proxy_ssl: verify: "on" trusted_certificate: /etc/ssl/whawty-auth-ca/ca.pem @@ -180,7 +180,7 @@ - webmail.chaos-at-home.org locations: '/': - proxy_pass: "https://{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-prometheus-legacy']) | ipaddr('address') }}/" + proxy_pass: "https://{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ch-prometheus-legacy']) | ansible.utils.ipaddr('address') }}/" proxy_ssl: verify: "on" trusted_certificate: /etc/ssl/prometheus-old-ca/ca.pem @@ -205,7 +205,7 @@ - webdav.chaos-at-home.org locations: '/': - proxy_pass: "https://{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-prometheus-legacy']) | ipaddr('address') }}/" + proxy_pass: "https://{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ch-prometheus-legacy']) | ansible.utils.ipaddr('address') }}/" proxy_ssl: verify: "on" trusted_certificate: /etc/ssl/prometheus-old-ca/ca.pem diff --git a/chaos-at-home/ch-mc.yml b/chaos-at-home/ch-mc.yml index 9f9e5b67..a9cb9707 100644 --- a/chaos-at-home/ch-mc.yml +++ b/chaos-at-home/ch-mc.yml @@ -14,7 +14,7 @@ post_tasks: - name: mount fileserver volumes mount: - src: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets['ch-prometheus']) | ipaddr('address') }}:/" + src: "{{ network_zones.lan.prefix | ansible.utils.ipaddr(network_zones.lan.offsets['ch-prometheus']) | ansible.utils.ipaddr('address') }}:/" path: /srv/files fstype: nfs4 opts: nodev,x-systemd.automount,nofail,ro diff --git a/dan/ele-emcplayer.yml b/dan/ele-emcplayer.yml index 8654c2af..91b1a555 100644 --- a/dan/ele-emcplayer.yml +++ b/dan/ele-emcplayer.yml @@ -19,7 +19,7 @@ copy: content: | #!/bin/bash - exec mpv -fs --loop=inf --af-add="channelmap=0|1:stereo" rtmp://{{ network_zones.guest.prefix | ipaddr(network_zones.guest.offsets['ele-helene']) | ipaddr('address') }}/emc/full + exec mpv -fs --loop=inf --af-add="channelmap=0|1:stereo" rtmp://{{ network_zones.guest.prefix | ansible.utils.ipaddr(network_zones.guest.offsets['ele-helene']) | ansible.utils.ipaddr('address') }}/emc/full dest: /usr/local/bin/emc-play.sh mode: 0755 diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index 779915d2..90e05149 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -125,14 +125,14 @@ network_services: ssh-jump: ports: - 2342 - addr: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-jump']) | ipaddr('address') }}" + addr: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets['ch-jump']) | ansible.utils.ipaddr('address') }}" http: ports: - 80 - 443 - addr: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets.__svc_http__) | ipaddr('address') }}" + addr: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets.__svc_http__) | ansible.utils.ipaddr('address') }}" imap: ports: #- 143 - 993 - addr: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets.__svc_imap__) | ipaddr('address') }}" + addr: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets.__svc_imap__) | ansible.utils.ipaddr('address') }}" diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index 7552382a..80957b29 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -40,12 +40,12 @@ network: domain: "{{ host_domain }}" primary: &_network_primary_ name: enp9s0 - 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: enp4s0 - 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]) }}" base_modules_blacklist: "{{ base_modules_blacklist_none }}" diff --git a/inventory/host_vars/ch-http-proxy.yml b/inventory/host_vars/ch-http-proxy.yml index 69acde86..1d3bc561 100644 --- a/inventory/host_vars/ch-http-proxy.yml +++ b/inventory/host_vars/ch-http-proxy.yml @@ -24,11 +24,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_ diff --git a/inventory/host_vars/ch-imap-proxy.yml b/inventory/host_vars/ch-imap-proxy.yml index 69acde86..1d3bc561 100644 --- a/inventory/host_vars/ch-imap-proxy.yml +++ b/inventory/host_vars/ch-imap-proxy.yml @@ -24,11 +24,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_ |