* Make dhcp_start and dhcp_end optional for subnet definitions
in undercloud.conf.
* Allow non-contiguous allocation pools for ctlplane subnets
Calcualte the allocation pools by removing the local_ip,
gateway, admin_host, public_host and ``inspection_iprange``,
from the subnets full ip range. Allocation_pools for all
remaining ranges will be configured. A new per-subnet option
``dhcp_exclude`` is added, a list of IP addresses or IP
ranges that will be excluded from the allocation pool. For
example:
dhcp_exclude = 172.20.0.101,172.20.0.210-172.20.0.219 ^ ip addr ^ ip range
If dhcp_start is defined and dhcp_end is not defined (or vice
versa) any addresses prior to (or after) this address is
removed from the allocation pools.
Make dhcp_start and dhcp_end options ListOpts to enable non-
contigous allocation pools. For example, to create allocation
pools: [{'start': '172.20.0.100', 'end': '172.20.0.150'}, {'start': '172.20.0.200', 'end': '172.20.0.250'}]
the following configuration can be used in undercloud.conf:
A new method is added for remote_subnet_opts, same options as
for the local_subnet_opts but without the defaults.
To allow optional dhcp_start and dhcp_end for the local_subnet
which have defaults defined, a condition is used to ignore
dhcp_start and dhcp_end in case they are the default values
and the cidr is NOT the default.
Reviewed: https:/ /review. openstack. org/624129 /git.openstack. org/cgit/ openstack/ python- tripleoclient/ commit/ ?id=8355e76ca4d 27305b48e38c1ad 4c360b07a953a1
Committed: https:/
Submitter: Zuul
Branch: master
commit 8355e76ca4d2730 5b48e38c1ad4c36 0b07a953a1
Author: Harald Jensås <email address hidden>
Date: Tue Dec 4 15:41:41 2018 +0100
Calculate undercloud ctlplane DHCP allocation pools
* Make dhcp_start and dhcp_end optional for subnet definitions
in undercloud.conf.
* Allow non-contiguous allocation pools for ctlplane subnets
Calcualte the allocation pools by removing the local_ip, iprange` `, exclude` ` is added, a list of IP addresses or IP
gateway, admin_host, public_host and ``inspection_
from the subnets full ip range. Allocation_pools for all
remaining ranges will be configured. A new per-subnet option
``dhcp_
ranges that will be excluded from the allocation pool. For
example:
dhcp_exclude = 172.20. 0.101,172. 20.0.210- 172.20. 0.219
^ ip addr ^ ip range
If dhcp_start is defined and dhcp_end is not defined (or vice
versa) any addresses prior to (or after) this address is
removed from the allocation pools.
Make dhcp_start and dhcp_end options ListOpts to enable non-
{' start': '172.20.0.200', 'end': '172.20.0.250'}]
contigous allocation pools. For example, to create allocation
pools: [{'start': '172.20.0.100', 'end': '172.20.0.150'},
the following configuration can be used in undercloud.conf:
dhcp_start = 172.20. 0.100,172. 20.0.200 0.150,172. 20.0.250
dhcp_end = 172.20.
A new method is added for remote_subnet_opts, same options as
for the local_subnet_opts but without the defaults.
To allow optional dhcp_start and dhcp_end for the local_subnet
which have defaults defined, a condition is used to ignore
dhcp_start and dhcp_end in case they are the default values
and the cidr is NOT the default.
Related-Bug: #1806512 52bd5b2c31009ac 8a2897bcd5f
Related-Bug: #1807707
Change-Id: I4ba148f465b4c4