Prefix ‘ipaddr’ and ‘ipv4’ with ‘ansible.utils.’.

This silences the following deprecation warning:

  Use 'ansible.utils.ipaddr' module instead. This feature will be removed from ansible.netcommon in a release after 2024-01-01.
  Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg.

11 files changed, 26 insertions, 26 deletions

diff --git a/roles/IMAP/templates/etc/postfix/main.cf.j2 b/roles/IMAP/templates/etc/postfix/main.cf.j2
index 2105d29..64a2a40 100644
--- a/roles/IMAP/templates/etc/postfix/main.cf.j2
+++ b/roles/IMAP/templates/etc/postfix/main.cf.j2
@@ -21,7 +21,7 @@ append_dot_mydomain = no
 mynetworks = 127.0.0.0/8, [::1]/128
 {%- if groups.all | length > 1 -%}
 {%- for mx in groups.MX | sort -%}
-           , {{ ipsec[ hostvars[mx].inventory_hostname_short ] | ipaddr }}
+           , {{ ipsec[ hostvars[mx].inventory_hostname_short ] | ansible.utils.ipaddr }}
 {%- endfor %}
 {% endif %}
 
diff --git a/roles/MSA/templates/etc/postfix/main.cf.j2 b/roles/MSA/templates/etc/postfix/main.cf.j2
index a435b0f..bc98d9e 100644
--- a/roles/MSA/templates/etc/postfix/main.cf.j2
+++ b/roles/MSA/templates/etc/postfix/main.cf.j2
@@ -20,7 +20,7 @@ append_dot_mydomain = no
 
 mynetworks = 127.0.0.0/8, [::1]/128
 {%- for h in groups.webmail | difference([inventory_hostname]) | sort -%}
-           , {{ ipsec[ hostvars[h].inventory_hostname_short ] | ipaddr }}
+           , {{ ipsec[ hostvars[h].inventory_hostname_short ] | ansible.utils.ipaddr }}
 {% endfor %}
 
 queue_directory       = /var/spool/postfix-{{ postfix_instance[inst].name }}
@@ -40,7 +40,7 @@ message_size_limit  = 67108864
 recipient_delimiter = +
 
 # Forward everything to our internal outgoing proxy
-relayhost     = [{{ postfix_instance.out.addr | ipaddr }}]:{{ postfix_instance.out.port }}
+relayhost     = [{{ postfix_instance.out.addr | ansible.utils.ipaddr }}]:{{ postfix_instance.out.port }}
 relay_domains =
 
 
diff --git a/roles/MX/templates/etc/postfix/main.cf.j2 b/roles/MX/templates/etc/postfix/main.cf.j2
index 36315d1..d10f901 100644
--- a/roles/MX/templates/etc/postfix/main.cf.j2
+++ b/roles/MX/templates/etc/postfix/main.cf.j2
@@ -37,7 +37,7 @@ message_size_limit  = 67108864
 recipient_delimiter = +
 
 # Forward everything to our internal outgoing proxy
-relayhost     = [{{ postfix_instance.out.addr | ipaddr }}]:{{ postfix_instance.out.port }}
+relayhost     = [{{ postfix_instance.out.addr | ansible.utils.ipaddr }}]:{{ postfix_instance.out.port }}
 relay_domains =
 
 
diff --git a/roles/MX/templates/etc/postfix/virtual/transport.j2 b/roles/MX/templates/etc/postfix/virtual/transport.j2
index 126cb72..536748a 100644
--- a/roles/MX/templates/etc/postfix/virtual/transport.j2
+++ b/roles/MX/templates/etc/postfix/virtual/transport.j2
@@ -17,5 +17,5 @@
 reserved.fripost.org    reserved-alias:
 discard.fripost.org     discard:
 
-mda.fripost.org   smtp:[{{ postfix_instance.IMAP.addr  | ipaddr }}]:{{ postfix_instance.IMAP.port  }}
-sympa.fripost.org smtp:[{{ postfix_instance.lists.addr | ipaddr }}]:{{ postfix_instance.lists.port }}
+mda.fripost.org   smtp:[{{ postfix_instance.IMAP.addr  | ansible.utils.ipaddr }}]:{{ postfix_instance.IMAP.port  }}
+sympa.fripost.org smtp:[{{ postfix_instance.lists.addr | ansible.utils.ipaddr }}]:{{ postfix_instance.lists.port }}
diff --git a/roles/common/templates/etc/ipsec.conf.j2 b/roles/common/templates/etc/ipsec.conf.j2
index 6b3840f..e7505b4 100644
--- a/roles/common/templates/etc/ipsec.conf.j2
+++ b/roles/common/templates/etc/ipsec.conf.j2
@@ -17,7 +17,7 @@ conn %default
 {% endif %}
     leftauth       = pubkey
     left           = %defaultroute
-    leftsubnet     = {{ ipsec[inventory_hostname_short] | ipv4 }}/32
+    leftsubnet     = {{ ipsec[inventory_hostname_short] | ansible.utils.ipv4 }}/32
     leftid         = {{ inventory_hostname }}
     leftsigkey     = {{ inventory_hostname_short }}.pem
     leftfirewall   = no
@@ -36,7 +36,7 @@ conn {{ hostvars[host].inventory_hostname_short }}
     rightallowany = yes
 {% endif %}
     rightsigkey   = {{ hostvars[host].inventory_hostname_short }}.pem
-    rightsubnet   = {{ ipsec[ hostvars[host].inventory_hostname_short ] | ipv4 }}/32
+    rightsubnet   = {{ ipsec[ hostvars[host].inventory_hostname_short ] | ansible.utils.ipv4 }}/32
 {% if 'NATed' not in group_names and 'NATed' in hostvars[host].group_names %}
     mobike        = yes
 {% endif %}
diff --git a/roles/common/templates/etc/munin/munin-node.conf.j2 b/roles/common/templates/etc/munin/munin-node.conf.j2
index a1391d9..1aba053 100644
--- a/roles/common/templates/etc/munin/munin-node.conf.j2
+++ b/roles/common/templates/etc/munin/munin-node.conf.j2
@@ -42,7 +42,7 @@ host_name {{ inventory_hostname_short }}
 # may repeat the allow line as many times as you'd like
 
 {% for host in groups['munin_master'] %}
-allow ^{{ ipsec[ hostvars[host].inventory_hostname_short ] | ipv4 | replace(".","\.") }}$
+allow ^{{ ipsec[ hostvars[host].inventory_hostname_short ] | ansible.utils.ipv4 | replace(".","\.") }}$
 {% endfor %}
 
 # Which address to bind to;
diff --git a/roles/common/templates/etc/nftables.conf.j2 b/roles/common/templates/etc/nftables.conf.j2
index 8d81d4c..66b1f9d 100755
--- a/roles/common/templates/etc/nftables.conf.j2
+++ b/roles/common/templates/etc/nftables.conf.j2
@@ -73,7 +73,7 @@ table netdev filter {
         # bogon filter (cf. RFC 6890 for non-global ip addresses)
         define bogon = {
             0.0.0.0/8          # this host, on this network (RFC 1122 sec. 3.2.1.3)
-{% if not addr | ipaddr('10.0.0.0/8') %}
+{% if not addr | ansible.utils.ipaddr('10.0.0.0/8') %}
           , 10.0.0.0/8         # private-use (RFC 1918)
 {% endif %}
           , 100.64.0.0/10      # shared address space (RFC 6598)
@@ -82,7 +82,7 @@ table netdev filter {
           , 172.16.0.0/12      # private-use (RFC 1918)
           , 192.0.0.0/24       # IETF protocol assignments (RFC 6890 sec. 2.1)
           , 192.0.2.0/24       # documentation (RFC 5737)
-{% if not addr | ipaddr('192.168.0.0/16') %}
+{% if not addr | ansible.utils.ipaddr('192.168.0.0/16') %}
           , 192.168.0.0/16     # private-use (RFC 1918)
 {% endif %}
           , 198.18.0.0/15      # benchmarking (RFC 2544)
diff --git a/roles/common/templates/etc/postfix/main.cf.j2 b/roles/common/templates/etc/postfix/main.cf.j2
index b369d43..5ac7920 100644
--- a/roles/common/templates/etc/postfix/main.cf.j2
+++ b/roles/common/templates/etc/postfix/main.cf.j2
@@ -31,7 +31,7 @@ virtual_alias_maps    = lmdb:/etc/aliases
 alias_database        = $virtual_alias_maps
 
 # Forward everything to our internal outgoing proxy
-relayhost     = [{{ postfix_instance.out.addr | ipaddr }}]:{{ postfix_instance.out.port }}
+relayhost     = [{{ postfix_instance.out.addr | ansible.utils.ipaddr }}]:{{ postfix_instance.out.port }}
 relay_domains =
 
 smtp_tls_security_level  = none
diff --git a/roles/lists/templates/etc/postfix/main.cf.j2 b/roles/lists/templates/etc/postfix/main.cf.j2
index 1bf02eb..2be1b41 100644
--- a/roles/lists/templates/etc/postfix/main.cf.j2
+++ b/roles/lists/templates/etc/postfix/main.cf.j2
@@ -21,7 +21,7 @@ append_dot_mydomain = no
 mynetworks = 127.0.0.0/8, [::1]/128
 {%- if groups.all | length > 1 -%}
 {%- for mx in groups.MX | sort -%}
-           , {{ ipsec[ hostvars[mx].inventory_hostname_short ] | ipaddr }}
+           , {{ ipsec[ hostvars[mx].inventory_hostname_short ] | ansible.utils.ipaddr }}
 {%- endfor %}
 {% endif %}
 
diff --git a/roles/webmail/tasks/roundcube.yml b/roles/webmail/tasks/roundcube.yml
index 1e27841..dc73358 100644
--- a/roles/webmail/tasks/roundcube.yml
+++ b/roles/webmail/tasks/roundcube.yml
@@ -110,19 +110,19 @@
     # IMAP
     #   WARNING: After hostname change update of mail_host column in users
     #   table is required to match old user data records with the new host.
-    - { var: default_host,           value: "'{{ imapsvr_addr | ipaddr }}'" }
-    - { var: default_port,           value: "143"                           }
-    - { var: imap_auth_type,         value: "'PLAIN'"                       }
-    - { var: imap_cache,             value: "null"                          }
-    - { var: imap_timeout,           value: "180"                           }
-    - { var: imap_force_ns,          value: "true"                          }
-    - { var: messages_cache,         value: "false"                         }
+    - { var: default_host,           value: "'{{ imapsvr_addr | ansible.utils.ipaddr }}'" }
+    - { var: default_port,           value: "143"                                         }
+    - { var: imap_auth_type,         value: "'PLAIN'"                                     }
+    - { var: imap_cache,             value: "null"                                        }
+    - { var: imap_timeout,           value: "180"                                         }
+    - { var: imap_force_ns,          value: "true"                                        }
+    - { var: messages_cache,         value: "false"                                       }
     # SMTP
-    - { var: smtp_server,            value: "'{{ postfix_instance.MSA.addr | ipaddr }}'" }
-    - { var: smtp_port,              value:  "{{ postfix_instance.MSA.port          }}"  }
-    - { var: smtp_auth_type,         value: "'PLAIN'"                                    }
-    - { var: smtp_user,              value: "'%u'"                                       }
-    - { var: smtp_pass,              value: "'%p'"                                       }
+    - { var: smtp_server,            value: "'{{ postfix_instance.MSA.addr | ansible.utils.ipaddr }}'" }
+    - { var: smtp_port,              value:  "{{ postfix_instance.MSA.port          }}"                }
+    - { var: smtp_auth_type,         value: "'PLAIN'"                                                  }
+    - { var: smtp_user,              value: "'%u'"                                                     }
+    - { var: smtp_pass,              value: "'%p'"                                                     }
     # System
     - { var: force_https,            value: "true"              }
     - { var: login_autocomplete,     value: "2"                 }
diff --git a/roles/webmail/templates/etc/roundcube/plugins/managesieve/config.inc.php.j2 b/roles/webmail/templates/etc/roundcube/plugins/managesieve/config.inc.php.j2
index 66af466..cdbea59 100644
--- a/roles/webmail/templates/etc/roundcube/plugins/managesieve/config.inc.php.j2
+++ b/roles/webmail/templates/etc/roundcube/plugins/managesieve/config.inc.php.j2
@@ -10,7 +10,7 @@ $config['managesieve_port'] = 4190;
 // %n - http hostname ($_SERVER['SERVER_NAME'])
 // %d - domain (http hostname without the first part)
 // For example %n = mail.domain.tld, %d = domain.tld
-$config['managesieve_host'] = '{{ imapsvr_addr | ipaddr }}';
+$config['managesieve_host'] = '{{ imapsvr_addr | ansible.utils.ipaddr }}';
 
 // authentication method. Can be CRAM-MD5, DIGEST-MD5, PLAIN, LOGIN, EXTERNAL
 // or none. Optional, defaults to best method supported by server.