MAAS

Merge lp:~andreserl/maas/change_dhcpd_conf_location into lp:~maas-committers/maas/trunk

  1. change_dhcpd_conf_location
  2. Merge into trunk
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
Merged at revision: 4178
Proposed branch: lp:~andreserl/maas/change_dhcpd_conf_location
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 52 lines (+5/-5)
4 files modified
HACKING.txt (+1/-1)
etc/maas/templates/dhcp/dhcpd.conf.template (+1/-1)
etc/maas/templates/dhcp/dhcpd6.conf.template (+1/-1)
src/provisioningserver/dhcp/__init__.py (+2/-2)
To merge this branch: bzr merge lp:~andreserl/maas/change_dhcpd_conf_location
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Gavin Panella (community) Approve
Review via email: mp+267640@code.launchpad.net

Commit message

Change the location of the dhcpd.conf generated file.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) wrote :

Looks good. There's another mention of /etc/maas/dhcpd.conf in HACKING.txt too that ought to be changed too.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'HACKING.txt'
2--- HACKING.txt 2015-07-07 12:39:20 +0000
3+++ HACKING.txt 2015-08-11 11:07:14 +0000
4@@ -287,7 +287,7 @@
5 Run ``maas-provision generate-dhcp-config -h`` to see the options. You will
6 need to provide various IP details such as the range of IP addresses to assign
7 to clients. You can use the generated output to configure your system's ISC
8-DHCP server, by inserting the configuration in the ``/etc/dhcp/dhcpd.conf``
9+DHCP server, by inserting the configuration in the ``/var/lib/maas/dhcpd.conf``
10 file.
11
12 Also, edit /etc/default/isc-dhcp-server to set the INTERFACES variable to just
13
14=== modified file 'etc/maas/templates/dhcp/dhcpd.conf.template'
15--- etc/maas/templates/dhcp/dhcpd.conf.template 2014-11-10 14:29:10 +0000
16+++ etc/maas/templates/dhcp/dhcpd.conf.template 2015-08-11 11:07:14 +0000
17@@ -1,4 +1,4 @@
18-# WARNING: Do not edit /etc/maas/dhcpd.conf yourself. MAAS will overwrite any
19+# WARNING: Do not edit /var/lib/maas/dhcpd.conf yourself. MAAS will overwrite any
20 # changes made there.
21 #
22 # Instead, edit /etc/maas/templates/dhcp/dhcpd.conf.template and your changes
23
24=== modified file 'etc/maas/templates/dhcp/dhcpd6.conf.template'
25--- etc/maas/templates/dhcp/dhcpd6.conf.template 2014-11-10 14:29:10 +0000
26+++ etc/maas/templates/dhcp/dhcpd6.conf.template 2015-08-11 11:07:14 +0000
27@@ -1,4 +1,4 @@
28-# WARNING: Do not edit /etc/maas/dhcpd6.conf yourself. MAAS will overwrite any
29+# WARNING: Do not edit /var/lib/maas/dhcpd6.conf yourself. MAAS will overwrite any
30 # changes made there.
31 #
32 # Instead, edit /etc/maas/templates/dhcp/dhcpd6.conf.template and your changes
33
34=== modified file 'src/provisioningserver/dhcp/__init__.py'
35--- src/provisioningserver/dhcp/__init__.py 2015-06-10 11:35:04 +0000
36+++ src/provisioningserver/dhcp/__init__.py 2015-08-11 11:07:14 +0000
37@@ -25,13 +25,13 @@
38 from provisioningserver.path import get_path
39
40 # Location of the DHCPv4 configuration file.
41-DHCPv4_CONFIG_FILE = '/etc/maas/dhcpd.conf'
42+DHCPv4_CONFIG_FILE = '/var/lib/maas/dhcpd.conf'
43
44 # Location of the DHCPv4 interfaces file.
45 DHCPv4_INTERFACES_FILE = '/var/lib/maas/dhcpd-interfaces'
46
47 # Location of the DHCPv6 configuration file.
48-DHCPv6_CONFIG_FILE = '/etc/maas/dhcpd6.conf'
49+DHCPv6_CONFIG_FILE = '/var/lib/maas/dhcpd6.conf'
50
51 # Location of the DHCPv6 interfaces file.
52 DHCPv6_INTERFACES_FILE = '/var/lib/maas/dhcpd6-interfaces'