fixing ansible.utils.ipaddr FQCN

Author: IPvSean

collections/requirements.yml

@@ -2,6 +2,8 @@
 collections:
   - name: amazon.aws
     version: 3.1.1
+  - name: ansible.utils
+    version: 2.5.2
   - name: ansible.network
     version: 1.2.0
   - name: ansible.posix

galaxy.yml

@@ -49,6 +49,7 @@ dependencies:
   # version 19.1.0 introduced a breaking change, fix likely to be released in 19.3.0
   # https://github.com/ansible/awx/pull/10336
   "amazon.aws": "3.1.1"
+  "ansible.utils": "2.5.2"
   "ansible.netcommon": "2.0.2"
   "ansible.posix": "1.3.0"
   "ansible.product_demos": "1.2.12"

provisioner/tests/security_verify.yml

@@ -40,12 +40,12 @@
         - name: Fail if eth0 is not in 172.16. or eth1 is not in 172.17.
           fail:
             msg: "IP address setup on ethX is not right on {{ inventory_hostname }}."
-          when: (((hostvars[inventory_hostname]['ansible_eth0']['ipv4']['address'] | ansible.netcommon.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['ansible_eth1']['ipv4']['address'] | ansible.netcommon.ipaddr('172.17.0.0/16') | string) is not search('172')))
+          when: (((hostvars[inventory_hostname]['ansible_eth0']['ipv4']['address'] | ansible.utils.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['ansible_eth1']['ipv4']['address'] | ansible.utils.ipaddr('172.17.0.0/16') | string) is not search('172')))
 
         - name: Fail if private_ip is not in 172.16. or private_ip2 is not in 172.17.
           fail:
             msg: "IP address setup on ethX is not right on {{ inventory_hostname }}."
-          when: (((hostvars[inventory_hostname]['private_ip'] | ansible.netcommon.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['private_ip2'] | ansible.netcommon.ipaddr('172.17.0.0/16') | string) is not search('172')))
+          when: (((hostvars[inventory_hostname]['private_ip'] | ansible.utils.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['private_ip2'] | ansible.utils.ipaddr('172.17.0.0/16') | string) is not search('172')))
 
       when: '"attack" in inventory_hostname'
 
@@ -63,12 +63,12 @@
         - name: Fail if eth0 is not in 172.16. or eth1 is not in 172.17.
           fail:
             msg: "IP address setup on ethX is not right on {{ inventory_hostname }}."
-          when: (((hostvars[inventory_hostname]['ansible_eth0']['ipv4']['address'] | ansible.netcommon.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['ansible_eth1']['ipv4']['address'] | ansible.netcommon.ipaddr('172.17.0.0/16') | string) is not search('172')))
+          when: (((hostvars[inventory_hostname]['ansible_eth0']['ipv4']['address'] | ansible.utils.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['ansible_eth1']['ipv4']['address'] | ansible.utils.ipaddr('172.17.0.0/16') | string) is not search('172')))
 
         - name: Fail if private_ip is not in 172.16. or private_ip2 is not in 172.17.
           fail:
             msg: "IP address setup on ethX is not right on {{ inventory_hostname }}."
-          when: (((hostvars[inventory_hostname]['private_ip'] | ansible.netcommon.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['private_ip2'] | ansible.netcommon.ipaddr('172.17.0.0/16') | string) is not search('172')))
+          when: (((hostvars[inventory_hostname]['private_ip'] | ansible.utils.ipaddr('172.16.0.0/16') | string) is not search('172')) or ((hostvars[inventory_hostname]['private_ip2'] | ansible.utils.ipaddr('172.17.0.0/16') | string) is not search('172')))
       when: '"snort" in inventory_hostname'
 
     - name: Check Point - Windows part

roles/configure_routers/templates/eos_core.j2

@@ -37,6 +37,6 @@ router bgp {{ device[short_name].local_as }}
  address-family ipv4
   neighbor {{ device[neighbor].bgp_tunnel_ip }} activate
   network 192.168.{{site}}.{{site}} mask 255.255.255.255
-  network {{ (device[short_name].ospf_tunnel_ip ~ '/24') | ansible.netcommon.ipaddr('network') }} mask 255.255.255.0
+  network {{ (device[short_name].ospf_tunnel_ip ~ '/24') | ansible.utils.ipaddr('network') }} mask 255.255.255.0
   network 10.200.200.0 mask 255.255.255.0
-  network {{ (private_ip ~ '/16') | ansible.netcommon.ipaddr('network') }}/16
+  network {{ (private_ip ~ '/16') | ansible.utils.ipaddr('network') }}/16

roles/configure_routers/templates/ios_core.j2

@@ -33,7 +33,7 @@ router bgp {{ device[short_name].local_as }}
   redistribute ospf 1
   neighbor {{ device[neighbor].bgp_tunnel_ip }} activate
   network 192.168.{{site}}.{{site}} mask 255.255.255.255
-  network {{ (device[short_name].ospf_tunnel_ip ~ '/24') | ansible.netcommon.ipaddr('network') }} mask 255.255.255.0
+  network {{ (device[short_name].ospf_tunnel_ip ~ '/24') | ansible.utils.ipaddr('network') }} mask 255.255.255.0
   network 10.200.200.0 mask 255.255.255.0
-  network {{ (private_ip ~ '/16') | ansible.netcommon.ipaddr('network') }}
+  network {{ (private_ip ~ '/16') | ansible.utils.ipaddr('network') }}
  exit-address-family

roles/manage_ec2_instances/tasks/inventory/addhost_security.yml

@@ -76,8 +76,8 @@
         ansible_user: "{{ item.tags.username }}"
         ansible_port: "{{ ssh_port }}"
         ansible_ssh_private_key_file: "{{ playbook_dir }}/{{ec2_name_prefix}}/{{ec2_name_prefix}}-private.pem"
-        private_ip: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.netcommon.ipaddr('172.16.0.0/16')|first }}"
-        private_ip2: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.netcommon.ipaddr('172.17.0.0/16')|first }}"
+        private_ip: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.utils.ipaddr('172.16.0.0/16')|first }}"
+        private_ip2: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.utils.ipaddr('172.17.0.0/16')|first }}"
         groups:
           - security
           - security_connection_check
@@ -111,8 +111,8 @@
         ansible_user: "{{ item.tags.username }}"
         ansible_port: "{{ ssh_port }}"
         ansible_ssh_private_key_file: "{{ playbook_dir }}/{{ec2_name_prefix}}/{{ec2_name_prefix}}-private.pem"
-        private_ip: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.netcommon.ipaddr('172.16.0.0/16')|first }}"
-        private_ip2: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.netcommon.ipaddr('172.17.0.0/16')|first }}"
+        private_ip: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.utils.ipaddr('172.16.0.0/16')|first }}"
+        private_ip2: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.utils.ipaddr('172.17.0.0/16')|first }}"
         groups:
           - security
           - security_connection_check
@@ -164,8 +164,8 @@
         ansible_user: "{{ item.tags.username }}"
         ansible_port: "{{ ssh_port }}"
         ansible_ssh_private_key_file: "{{ playbook_dir }}/{{ec2_name_prefix}}/{{ec2_name_prefix}}-private.pem"
-        private_ip: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.netcommon.ipaddr('172.16.0.0/16')|first }}"
-        private_ip2: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.netcommon.ipaddr('172.17.0.0/16')|first }}"
+        private_ip: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.utils.ipaddr('172.16.0.0/16')|first }}"
+        private_ip2: "{{ item['network_interfaces']|map(attribute='private_ip_address')|list|ansible.utils.ipaddr('172.17.0.0/16')|first }}"
         groups:
           - security
           - checkpoint