Inconsistency in dhcp-agent when filling hosts and opts files

[Alexey I. Froloff]

We have bunch of subnets created in pre-Icehouse era, that have ipv6_address_mode and ipv6_ra_mode unset. For dhcpv6 functionality we rely on enable_dhcp setting for a subnet. However, in _iter_hosts port is skipped iff ipv6_address_mode set to SLAAC, but in _generate_opts_per_subnet subnet is skipped when ipv6_address_mode id SLAAC or unset.

Since we can not update ipv6_address_mode attribute in existing subnets (allow_put is False), this breaks DHCPv6 for these VMs.

[Henry Gessau (gessau)]

Related bug:
https://bugs.launchpad.net/neutron/+bug/1407573

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/229569
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=81c5e511f704861a08f2e3938edca97474d4c44c
Submitter: Jenkins
Branch: master

commit 81c5e511f704861a08f2e3938edca97474d4c44c
Author: Alexey I. Froloff <email address hidden>
Date: Wed Sep 30 21:38:24 2015 +0300

    Fix inconsistency in DHCPv6 hosts and options generation

    The DHCP agent is inconsistent in how it handles subnets whose
    ipv6_address_mode is not slaac. While the DHCP agent writes out both
    DHCPv6 host entries and DHCPv6 options for ports scoped by the subnet
    for dnsmasq to use, subnet specific options are not written.

    This patch addresses this inconsistency by generating subnet specific
    options when the subnet's ipv6_address_mode is not slaac.

    Closes-Bug: #1501451

    Change-Id: I372c93fa5667e955c7b81181daa2e66f47d85fdf

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/liberty
Review: https://review.openstack.org/235862

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/kilo
Review: https://review.openstack.org/235864

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/juno
Review: https://review.openstack.org/235867

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/235862
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=bdb006f57851882d5141af7e6844c74f4f1a5226
Submitter: Jenkins
Branch: stable/liberty

commit bdb006f57851882d5141af7e6844c74f4f1a5226
Author: Alexey I. Froloff <email address hidden>
Date: Wed Sep 30 21:38:24 2015 +0300

    Fix inconsistency in DHCPv6 hosts and options generation

    The DHCP agent is inconsistent in how it handles subnets whose
    ipv6_address_mode is not slaac. While the DHCP agent writes out both
    DHCPv6 host entries and DHCPv6 options for ports scoped by the subnet
    for dnsmasq to use, subnet specific options are not written.

    This patch addresses this inconsistency by generating subnet specific
    options when the subnet's ipv6_address_mode is not slaac.

    Closes-Bug: #1501451

    Change-Id: I372c93fa5667e955c7b81181daa2e66f47d85fdf
    (cherry picked from commit 81c5e511f704861a08f2e3938edca97474d4c44c)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/235867
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=fb58b4ba5678dc694cb0937b925ed70232c4ae45
Submitter: Jenkins
Branch: stable/juno

commit fb58b4ba5678dc694cb0937b925ed70232c4ae45
Author: Alexey I. Froloff <email address hidden>
Date: Wed Sep 30 21:38:24 2015 +0300

    Fix inconsistency in DHCPv6 hosts and options generation

    The DHCP agent is inconsistent in how it handles subnets whose
    ipv6_address_mode is not slaac. While the DHCP agent writes out both
    DHCPv6 host entries and DHCPv6 options for ports scoped by the subnet
    for dnsmasq to use, subnet specific options are not written.

    This patch addresses this inconsistency by generating subnet specific
    options when the subnet's ipv6_address_mode is not slaac.

    Closes-Bug: #1501451

    Conflicts:
     neutron/tests/unit/agent/linux/test_dhcp.py

    Conflict is due to the test file changed location in Kilo. Also added
    _test_output_opts_file that was missing in Juno.

    Change-Id: I372c93fa5667e955c7b81181daa2e66f47d85fdf
    (cherry picked from commit 81c5e511f704861a08f2e3938edca97474d4c44c)

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/235864
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=f76a9609f00c004e12a5b0a019f9729080415771
Submitter: Jenkins
Branch: stable/kilo

commit f76a9609f00c004e12a5b0a019f9729080415771
Author: Alexey I. Froloff <email address hidden>
Date: Wed Sep 30 21:38:24 2015 +0300

    Fix inconsistency in DHCPv6 hosts and options generation

    The DHCP agent is inconsistent in how it handles subnets whose
    ipv6_address_mode is not slaac. While the DHCP agent writes out both
    DHCPv6 host entries and DHCPv6 options for ports scoped by the subnet
    for dnsmasq to use, subnet specific options are not written.

    This patch addresses this inconsistency by generating subnet specific
    options when the subnet's ipv6_address_mode is not slaac.

    Closes-Bug: #1501451

    Change-Id: I372c93fa5667e955c7b81181daa2e66f47d85fdf
    (cherry picked from commit 81c5e511f704861a08f2e3938edca97474d4c44c)

[Thierry Carrez (ttx)]

This issue was fixed in the openstack/neutron 8.0.0.0b1 development milestone.

[Doug Hellmann (doug-hellmann)]

This issue was fixed in the openstack/neutron 7.0.1 release.