8355e76ca4
* 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:
dhcp_start = 172.20.0.100,172.20.0.200
dhcp_end = 172.20.0.150,172.20.0.250
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
Related-Bug: #1807707
Change-Id: I4ba148f465b4c452bd5b2c31009ac8a2897bcd5f
34 lines
1.7 KiB
YAML
34 lines
1.7 KiB
YAML
---
|
|
features:
|
|
- |
|
|
The ``dhcp_start`` and ``dhcp_end`` options are now optional for subnet
|
|
definitions in the Undercloud configuration (``undercloud.conf``).
|
|
The the allocation_pools are calculated by removing the ``local_ip``,
|
|
``gateway``, ``undercloud_admin_host``, ``undercloud_public_host`` and
|
|
``inspection_iprange`` from the subnets full IP range. Allocation pools for
|
|
all remaining ranges will be configured. Additionally the new option
|
|
``dhcp_exlcude`` can be used to exclude additional IP addresses and/or
|
|
IP address ranges, for example to exclude ``172.20.0.105`` and the range
|
|
``172.20.0.210-172.20.0.219``::
|
|
|
|
dhcp_exclude = 172.20.0.105,172.20.0.210-172.20.0.219
|
|
|
|
* When ``dhcp_start`` is defined any addresses prior to this address is
|
|
also removed from the allocation pools.
|
|
* When ``dhcp_end`` is defined any addresses after this address is also
|
|
removed from the allocation pools.
|
|
|
|
.. Note:: If the default cidr (``192.168.24.0/24``) is used for the local
|
|
subnet the ``dhcp_start`` and ``dhcp_end`` cannot simply be
|
|
removed to utilize the full address space of the subnet. This due
|
|
to the default values of ``dhcp_start`` and ``dhcp_end``.
|
|
- |
|
|
It is now possible to configure non-contiguous allocation pools for the
|
|
Undercloud ctlplane subnets. The ``dhcp_start`` and ``dhcp_end`` options
|
|
have been extended to allow a list of start and end address pairs. For
|
|
example to create allocation pools ``172.20.0.100-172.20.0.150`` and
|
|
``172.20.0.200-172.20.0.250``::
|
|
|
|
dhcp_start = 172.20.0.100,172.20.0.200
|
|
dhcp_end = 172.20.0.150,172.20.0.250
|