# HG changeset patch
# User Vardhnee Ramanujam Ravi <vardhnee.ramanujam.ravi@oracle.com>
# Date 1464919886 25200
# Node ID 9a454a2f1c354948df962bb1a71077e36d39677f
# Parent  d11d29f2920ae244421921dbe6b3fa910214c866
23506589 Need to modify args passed to dnsmasq in solaris/dhcp.py
23515020 Need to address logic error in neutron-dhcp-agent

diff -r d11d29f2920a -r 9a454a2f1c35 components/openstack/neutron/files/agent/solaris/dhcp.py
--- a/components/openstack/neutron/files/agent/solaris/dhcp.py	Thu Jun 02 17:56:33 2016 -0700
+++ b/components/openstack/neutron/files/agent/solaris/dhcp.py	Thu Jun 02 19:11:26 2016 -0700
@@ -56,8 +56,7 @@
             '--dhcp-hostsfile=%s' % self.get_conf_file_name('host'),
             '--addn-hosts=%s' % self.get_conf_file_name('addn_hosts'),
             '--dhcp-optsfile=%s' % self.get_conf_file_name('opts'),
-            '--leasefile-ro',
-            '--dhcp-authoritative'
+            '--dhcp-leasefile=%s' % self.get_conf_file_name('leases')
         ]
 
         possible_leases = 0
@@ -268,7 +267,7 @@
             else:
                 addrconf = True
 
-            self.driver.init_l3(interface_name, ip_cidrs, addrconf=addrconf)
+        self.driver.init_l3(interface_name, ip_cidrs, addrconf=addrconf)
 
         return interface_name