Merge lp:~lamont/maas/bug-1553665 into lp:~maas-committers/maas/trunk

[LaMont Jones]

Addresses that are not used anymore should not remain in the DNS. Reduce the default lease time to make that happen faster.

Adjust the default lease time so that things fall out of the DNS once they are not in use any more.

[Mike Pontillo (mpontillo)]

Looks good to me.

My only concern about this branch is whether or not 3 minutes is enough. I don't know if I trust PXE/EFI environments to follow DHCP standards fully and renew their leases at the appropriate times.

But I suppose we'll find out. ;-) Just something to consider, in case you want to make it maybe 5-10 minutes.

review: Approve

[Andres Rodriguez (andreserl)]

Yeah I agree with Mike here. I'd prefer 5 or even 10 minute lease. What we
need to ensure is that juju doesn't continue to use IP's from the dynamic
range.

On Wednesday, April 13, 2016, Mike Pontillo <email address hidden>
wrote:

> Review: Approve
>
> Looks good to me.
>
> My only concern about this branch is whether or not 3 minutes is enough. I
> don't know if I trust PXE/EFI environments to follow DHCP standards fully
> and renew their leases at the appropriate times.
>
> But I suppose we'll find out. ;-) Just something to consider, in case you
> want to make it maybe 5-10 minutes.
> --
> https://code.launchpad.net/~lamont/maas/bug-1553665/+merge/291704
> You are subscribed to branch lp:maas.
>

--
Andres Rodriguez (RoAkSoAx)
Ubuntu Server Developer
MSc. Telecom & Networking
Systems Engineer

=== modified file 'src/maasserver/dhcp.py'
--- src/maasserver/dhcp.py	2016-04-01 21:14:24 +0000
+++ src/maasserver/dhcp.py	2016-04-13 16:57:23 +0000
@@ -572,7 +572,7 @@
         ipv6_exc = exc
         ipv6_status = SERVICE_STATUS.DEAD
         log.err(
-            "Error configuring DHCPv4 on rack controller '%s': %s" % (
+            "Error configuring DHCPv6 on rack controller '%s': %s" % (
                 rack_controller.system_id, exc))
     else:
         if len(shared_networks_v6) > 0:
@@ -580,7 +580,7 @@
         else:
             ipv6_status = SERVICE_STATUS.OFF
         log.msg(
-            "Successfully configured DHCPv4 on rack controller '%s'." % (
+            "Successfully configured DHCPv6 on rack controller '%s'." % (
                 rack_controller.system_id))
 
     # Update the status for both services so the user is always seeing the
 
=== modified file 'src/provisioningserver/templates/dhcp/dhcpd.conf.template'
--- src/provisioningserver/templates/dhcp/dhcpd.conf.template	2016-03-28 13:54:47 +0000
+++ src/provisioningserver/templates/dhcp/dhcpd.conf.template	2016-04-13 16:57:23 +0000
@@ -59,6 +59,8 @@
            {{if dhcp_subnet.get('ntp_server')}}
            option ntp-servers {{dhcp_subnet['ntp_server']}};
            {{endif}}
+           default-lease-time 600;
+           max-lease-time 600;
            #
            # Subnet DHCP snippets
            #
 
=== modified file 'src/provisioningserver/templates/dhcp/dhcpd6.conf.template'
--- src/provisioningserver/templates/dhcp/dhcpd6.conf.template	2016-04-01 21:34:36 +0000
+++ src/provisioningserver/templates/dhcp/dhcpd6.conf.template	2016-04-13 16:57:23 +0000
@@ -61,6 +61,8 @@
            {{if dhcp_subnet.get('ntp_server')}}
            option ntp-servers {{dhcp_subnet['ntp_server']}};
            {{endif}}
+           default-lease-time 600;
+           max-lease-time 600;
            #
            # Subnet DHCP snippets
            #