MAAS

Merge lp:~jtv/maas/dhcpv6-tweak-dns-server-option into lp:~maas-committers/maas/trunk

  1. dhcpv6-tweak-dns-server-option
  2. Merge into trunk
Proposed by Jeroen T. Vermeulen
Status: Superseded
Proposed branch: lp:~jtv/maas/dhcpv6-tweak-dns-server-option
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
etc/maas/templates/dhcp/dhcpd6.conf.template (+1/-1)
To merge this branch: bzr merge lp:~jtv/maas/dhcpv6-tweak-dns-server-option
Reviewer Review Type Date Requested Status
MAAS Maintainers Pending
Review via email: mp+231502@code.launchpad.net

Commit message

Update dhcpd apparmor config to allow us to serve (stateful) DHCPv6 as well.

Includes workaround for known bug in the dhcpd package that stopped dhcpd from rewriting its leases file. This seems to be what led to those huge leases files we got.

Description of the change

Using this config I can run a DHCPv6 server manually. As with DHCPv4, the upstart script will have to create the leases file manually if it doesn't yet exist.

Jeroen

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/maas/templates/dhcp/dhcpd6.conf.template'
2--- etc/maas/templates/dhcp/dhcpd6.conf.template 2014-08-18 10:53:21 +0000
3+++ etc/maas/templates/dhcp/dhcpd6.conf.template 2014-08-20 04:23:36 +0000
4@@ -12,7 +12,7 @@
5 {{bootloader}}
6 interface "{{dhcp_subnet['interface']}}";
7 ignore-client-uids true;
8- option domain-name-servers {{dhcp_subnet['dns_servers']}};
9+ option dhcp6.name-servers {{dhcp_subnet['dns_servers']}};
10 option domain-name "{{dhcp_subnet['domain_name']}}";
11 option routers {{dhcp_subnet['router_ip']}};
12 {{if dhcp_subnet.get('ntp_server')}}