Merge "Not assign dynamic IPv6 address on dhcp interface"

diff --cc neutron/agent/linux/dhcp.py
index fa4fb853b201053ce534b11c71991e25c4ce9e6d,472d7fd3383a80d1663799476201217ed6b3be7f..26284ef7b31df5242f8884768ce1dfc84dc666ef
--- 1/neutron/agent/linux/dhcp.py
--- 2/neutron/agent/linux/dhcp.py
+++ b/neutron/agent/linux/dhcp.py
@@@ -30,8 -30,9 +30,9 @@@ from neutron.agent.linux import ip_li
  from neutron.agent.linux import utils
  from neutron.common import constants
  from neutron.common import exceptions
+ from neutron.common import ipv6_utils
  from neutron.common import utils as commonutils
 -from neutron.i18n import _LE
 +from neutron.i18n import _LE, _LI
  from neutron.openstack.common import log as logging
  from neutron.openstack.common import uuidutils
  

diff --cc neutron/tests/unit/test_dhcp_agent.py
Simple merge