From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 2 Dec 2015 23:18:41 +0000 (+0000)
Subject: Merge "Support for IPv6 RDNSS Option in Router Advts"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7869954dd305fe64c93d77d519cd8312b5524f14;p=openstack-build%2Fneutron-build.git

Merge "Support for IPv6 RDNSS Option in Router Advts"
---

7869954dd305fe64c93d77d519cd8312b5524f14
diff --cc neutron/agent/linux/ra.py
index a6fffd328,67fdb31b2..fcdd1c830
--- a/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):