Merge "Add NeutronDhcpAgentDnsmasqEnableAddr6List param" into stable/train

This commit is contained in:
Zuul 2020-05-12 00:14:07 +00:00 committed by Gerrit Code Review
commit 6fa6914bdc
2 changed files with 13 additions and 0 deletions

View File

@ -141,6 +141,12 @@ parameters:
no AZs will be configured for Neutron network services.
default: ''
type: string
NeutronDhcpAgentDnsmasqEnableAddr6List:
default: true
description: |
Enable dhcp-host entry with list of addresses when port has multiple
IPv6 addresses in the same subnet.
type: boolean
conditions:
@ -204,6 +210,7 @@ outputs:
neutron::agents::dhcp::dnsmasq_dns_servers: {get_param: NeutronDhcpAgentDnsmasqDnsServers}
neutron::agents::dhcp::interface_driver: {get_param: NeutronInterfaceDriver}
neutron::agents::dhcp::dhcp_broadcast_reply: {get_param: NeutronDhcpServerBroadcastReply}
neutron::agents::dhcp::dnsmasq_enable_addr6_list: {get_param: NeutronDhcpAgentDnsmasqEnableAddr6List}
neutron::agents::dhcp::debug:
if:
- service_debug_unset

View File

@ -0,0 +1,6 @@
---
features:
- |
Add boolean parameter ``NeutronDhcpAgentDnsmasqEnableAddr6List`` to support
the ``dnsmasq_enable_addr6_list`` option in dhcp agent settings.
(See bug: `#1861032 <https://bugs.launchpad.net/neutron/+bug/1861032>`_)