Merge "Support for IPv6 RDNSS Option in Router Advts"

diff --cc neutron/agent/linux/ra.py
index a6fffd328252d7fe0abe974f59c8179b1c6d3b99,67fdb31b24a61f503cb512dcdf517faee1341ffe..fcdd1c830dfb47c87b29f6f961d2fb687e2b2854
--- 1/neutron/agent/linux/ra.py
--- 2/neutron/agent/linux/ra.py
+++ b/neutron/agent/linux/ra.py
@@@ -93,9 -103,10 +104,10 @@@ class DaemonMonitor(object)
                  ra_modes=list(ra_modes),
                  interface_name=interface_name,
                  prefixes=auto_config_prefixes,
+                 dns_servers=dns_servers[0:MAX_RDNSS_ENTRIES],
                  constants=constants))
  
 -        utils.replace_file(radvd_conf, buf.getvalue())
 +        common_utils.replace_file(radvd_conf, buf.getvalue())
          return radvd_conf
  
      def _get_radvd_process_manager(self, callback=None):

diff --cc neutron/db/l3_db.py
Simple merge

diff --cc neutron/tests/common/l3_test_common.py
Simple merge

diff --cc neutron/tests/unit/agent/l3/test_agent.py
Simple merge