MAAS

Merge lp:~julian-edwards/maas/dhcp-path-bug-1057842 into lp:~maas-committers/maas/trunk

  1. dhcp-path-bug-1057842
  2. Merge into trunk
Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 1094
Proposed branch: lp:~julian-edwards/maas/dhcp-path-bug-1057842
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
etc/celeryconfig.py (+1/-1)
To merge this branch: bzr merge lp:~julian-edwards/maas/dhcp-path-bug-1057842
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+126839@code.launchpad.net

Commit message

Fix the default DHCP leases file location in celeryconfig.py.

This was recently changed in packaging but omitted in the upstream code.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'etc/celeryconfig.py'
2--- etc/celeryconfig.py 2012-09-27 09:19:24 +0000
3+++ etc/celeryconfig.py 2012-09-28 01:12:31 +0000
4@@ -35,7 +35,7 @@
5 DNS_RNDC_PORT = 954
6
7 # DHCP leases file, as maintained by ISC dhcpd.
8-DHCP_LEASES_FILE = '/var/lib/maas/dhcpd.leases'
9+DHCP_LEASES_FILE = '/var/lib/maas/dhcp/dhcpd.leases'
10
11 # ISC dhcpd configuration file.
12 DHCP_CONFIG_FILE = '/etc/maas/dhcpd.conf'