equal
deleted
inserted
replaced
54 '--except-interface=lo0', |
54 '--except-interface=lo0', |
55 '--pid-file=%s' % pid_file, |
55 '--pid-file=%s' % pid_file, |
56 '--dhcp-hostsfile=%s' % self.get_conf_file_name('host'), |
56 '--dhcp-hostsfile=%s' % self.get_conf_file_name('host'), |
57 '--addn-hosts=%s' % self.get_conf_file_name('addn_hosts'), |
57 '--addn-hosts=%s' % self.get_conf_file_name('addn_hosts'), |
58 '--dhcp-optsfile=%s' % self.get_conf_file_name('opts'), |
58 '--dhcp-optsfile=%s' % self.get_conf_file_name('opts'), |
59 '--leasefile-ro', |
59 '--dhcp-leasefile=%s' % self.get_conf_file_name('leases') |
60 '--dhcp-authoritative' |
|
61 ] |
60 ] |
62 |
61 |
63 possible_leases = 0 |
62 possible_leases = 0 |
64 for i, subnet in enumerate(self.network.subnets): |
63 for i, subnet in enumerate(self.network.subnets): |
65 mode = None |
64 mode = None |
266 ip_cidr = '%s/%s' % (fixed_ip.ip_address, net.prefixlen) |
265 ip_cidr = '%s/%s' % (fixed_ip.ip_address, net.prefixlen) |
267 ip_cidrs.append(ip_cidr) |
266 ip_cidrs.append(ip_cidr) |
268 else: |
267 else: |
269 addrconf = True |
268 addrconf = True |
270 |
269 |
271 self.driver.init_l3(interface_name, ip_cidrs, addrconf=addrconf) |
270 self.driver.init_l3(interface_name, ip_cidrs, addrconf=addrconf) |
272 |
271 |
273 return interface_name |
272 return interface_name |
274 |
273 |
275 def destroy(self, network, device_name): |
274 def destroy(self, network, device_name): |
276 """Destroy the device used for the network's DHCP on this host.""" |
275 """Destroy the device used for the network's DHCP on this host.""" |