dhcp_start and dhcp_end should be optional for non-local subnet definitions in undercloud.conf.

[Harald Jensås]

dhcp_start and dhcp_end should be optional for non-local subnet definitions added to undercloud.conf.

Currently the dhcp_start and dhcp_end are mandatory for all subnets.
With the option to use predictive IP assignment on the ctlplane, these should become non-mandatory for non-local subnets.

(The local subnet requires a range of at least 1 address that will be allocated to the neutron DHCP agent.)

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/624129

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/624130

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/624129
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=8355e76ca4d27305b48e38c1ad4c360b07a953a1
Submitter: Zuul
Branch: master

commit 8355e76ca4d27305b48e38c1ad4c360b07a953a1
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,
    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

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/626188

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/624130
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=88ab644bdfeb5cb105ec2390703cb056c14dd6ea
Submitter: Zuul
Branch: master

commit 88ab644bdfeb5cb105ec2390703cb056c14dd6ea
Author: Harald Jensås <email address hidden>
Date: Thu Dec 6 04:26:06 2018 +0100

    Use calculated undercloud ctlplane DHCP allocation pools

    Change: I4ba148f465b4c452bd5b2c31009ac8a2897bcd5f makes
    dhcp_start and dhcp_end optional for non-local subnet
    definitions in undercloud.conf.

    Start using the AllocationPools parameter istead of the
    legacy DhcpStart | DhcpEnd parameters.

    Closes-Bug: #1806512
    Closes-Bug: #1807707
    Depends-On: I4ba148f465b4c452bd5b2c31009ac8a2897bcd5f
    Change-Id: Ifdf3e9d22766c1b5ede151979b93754a3d244cc3

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/626188
Committed: https://git.openstack.org/cgit/openstack/python-tripleoclient/commit/?id=5c293711d8cf85e22188280137003418cb0970a9
Submitter: Zuul
Branch: master

commit 5c293711d8cf85e22188280137003418cb0970a9
Author: Harald Jensås <email address hidden>
Date: Wed Dec 19 16:01:12 2018 +0100

    Remove DhcpStart and DhcpEnd - Replaced by AllocationPools

    THT change Ifdf3e9d22766c1b5ede151979b93754a3d244cc3 switched
    to use the AllocationPools parameter, replacing use of the
    DhcpStart and DhcpEnd parameters.

    Change-Id: Ia96c3af388c40c0bd6ca2b58d1ac5a242608c89d
    Related-Bug: #1806512
    Depends-On: Ifdf3e9d22766c1b5ede151979b93754a3d244cc3

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 10.3.0 release.