From dfa077659df3d8ac729fa7f4bde1364e913fd800 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Wed, 2 Mar 2022 14:22:34 +0100 Subject: [PATCH] Add ansible.utils collectoin requirement ipaddr filter has been moved from netcommon to utils collection [1] Based on that we must add that collection to requirements. [1] https://github.com/ansible-collections/ansible.netcommon/commit/db4920ebf6bae6476ff8829e2cf475f19f83a990 Change-Id: Id834c484e405a805ef87b260a8fd2ea440096937 --- ansible-collection-requirements.yml | 3 +++ inventory/group_vars/neutron_calico_dhcp_agent.yml | 4 ++-- playbooks/healthcheck-hosts.yml | 2 +- .../roles/bootstrap-host/templates/user_variables_ceph.yml.j2 | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml index cdc260bcd7..a0d25335c3 100644 --- a/ansible-collection-requirements.yml +++ b/ansible-collection-requirements.yml @@ -29,6 +29,9 @@ collections: - name: ansible.netcommon version: 2.5.1 source: https://galaxy.ansible.com +- name: ansible.utils + version: 2.5.2 + source: https://galaxy.ansible.com - name: openvswitch.openvswitch version: 2.1.0 source: https://galaxy.ansible.com diff --git a/inventory/group_vars/neutron_calico_dhcp_agent.yml b/inventory/group_vars/neutron_calico_dhcp_agent.yml index c390ec616f..8aa21d039a 100644 --- a/inventory/group_vars/neutron_calico_dhcp_agent.yml +++ b/inventory/group_vars/neutron_calico_dhcp_agent.yml @@ -35,8 +35,8 @@ bird_bgp_ipv6_peer_ip: >- and ansible_facts['default_ipv6']['prefix'] is defined %} {{ ((ansible_facts['default_ipv6']['address'] ~ '/' ~ ansible_facts['default_ipv6']['prefix']) | - ipaddr('network') ~ '/' ~ ansible_facts['default_ipv6']['prefix'] - ) | ipaddr('net') | ipaddr(1) | ipaddr('address') + ansible.utils.ipaddr('network') ~ '/' ~ ansible_facts['default_ipv6']['prefix'] + ) | ansible.utils.ipaddr('net') | ansible.utils.ipaddr(1) | ansible.utils.ipaddr('address') }} {% endif %} diff --git a/playbooks/healthcheck-hosts.yml b/playbooks/healthcheck-hosts.yml index c2ddbdee7f..5ebc18c003 100644 --- a/playbooks/healthcheck-hosts.yml +++ b/playbooks/healthcheck-hosts.yml @@ -63,7 +63,7 @@ - name: Check your internal network is using private ips assert: that: - - internal_lb_vip_address | ipaddr('private') + - internal_lb_vip_address | ansible.utils.ipaddr('private') # Test openstack_hosts role - name: Playbook for role testing diff --git a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 index 403e4902d2..5d5d514501 100644 --- a/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 +++ b/tests/roles/bootstrap-host/templates/user_variables_ceph.yml.j2 @@ -17,7 +17,7 @@ is_hci: true common_single_host_mode: true monitor_interface: "{{ ('metal' in bootstrap_host_scenarios_expanded) | ternary('br-mgmt', 'eth1') }}" # Management network in the AIO -public_network: "{{ (mgmt_range ~ '.0/' ~ netmask) | ipaddr('net') }}" +public_network: "{{ (mgmt_range ~ '.0/' ~ netmask) | ansible.utils.ipaddr('net') }}" journal_size: 100 osd_scenario: collocated ceph_conf_overrides_custom: