]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commit
Replace ipaddr() with ips_in_ranges()
authorHarald Jensås <hjensas@redhat.com>
Wed, 14 Aug 2019 17:14:09 +0000 (19:14 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Fri, 27 Sep 2019 15:49:46 +0000 (17:49 +0200)
commit5fea830414e7eb4cf6f1d0008834e2c4b205b131
tree9ab5dfcd3fbd3ccf124d944f56c03df3d13fc3b5
parent2d1372fe2aa2667c32f658be0b575cc5341fcd3b
Replace ipaddr() with ips_in_ranges()

This change implements a filter_plugin that is used in the
ceph-facts, ceph-validate roles and infrastucture-playbooks.
The new filter plugin will return a list of all IP address
that reside in any one of the given IP ranges. The new filter
replaces the use of the ipaddr filter.

ceph.conf already support a comma separated list of CIDRs
for the public_network and cluster_network options.

Changes: [1] and [2] introduced a regression in ceph-ansible
where public_network can no longer be a comma separated list
of cidrs.

With this change a comma separated list of subnet CIDRs can
also be used for monitor_address_block and radosgw_address_block.

[1] commit: d67230b2a26b40651c1c1dbee68a92b0e851f3d5
[2] commit: 20e4852888ecc76d8d0fa194a438fa2a90e1cde3

Related-To: https://bugs.launchpad.net/tripleo/+bug/1840030
Related-To: https://bugzilla.redhat.com/show_bug.cgi?id=1740283
Closes: #4333
Please backport to stable-4.0

Signed-off-by: Harald Jensås <hjensas@redhat.com>
(cherry picked from commit e695efcaf79909e2237197fd473117930e8d83e5)
14 files changed:
.travis.yml
ansible.cfg
infrastructure-playbooks/purge-cluster.yml
infrastructure-playbooks/purge-docker-cluster.yml
plugins/filter/__init__.py [new file with mode: 0644]
plugins/filter/ipaddrs_in_ranges.py [new file with mode: 0644]
plugins/filter/test_ipaddrs_in_ranges.py [new file with mode: 0644]
roles/ceph-facts/tasks/facts.yml
roles/ceph-facts/tasks/set_monitor_address.yml
roles/ceph-facts/tasks/set_radosgw_address.yml
roles/ceph-validate/tasks/check_ipaddr_mon.yml
tox-podman.ini
tox-update.ini
tox.ini