openstack
/
neutron
Code Issues Proposed changes

Merge "Add ipxe6 dnsmasq tag to enable ipv6 dhcp client matching"

This commit is contained in:
Zuul 2018-12-19 02:19:39 +00:00 committed by Gerrit Code Review
parent 7d9173d6f1 09311c34f9
commit 8c59cfe98e
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
neutron/agent/linux/dhcp.py
View File

@ -337,6 +337,7 @@ class Dnsmasq(DhcpLocalProcess):
'--dhcp-optsfile=%s' % self.get_conf_file_name('opts'),
'--dhcp-leasefile=%s' % self.get_conf_file_name('leases'),
'--dhcp-match=set:ipxe,175',
'--dhcp-userclass=set:ipxe6,iPXE',
'--local-service',
]
if self.device_manager.driver.bridged:

1
neutron/tests/unit/agent/linux/test_dhcp.py
View File

@ -1271,6 +1271,7 @@ class TestDnsmasq(TestBase):
'--dhcp-optsfile=/dhcp/%s/opts' % network.id,
'--dhcp-leasefile=/dhcp/%s/leases' % network.id,
'--dhcp-match=set:ipxe,175',
'--dhcp-userclass=set:ipxe6,iPXE',
'--local-service',
'--bind-interfaces',
]