launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/maas/hacking-deps into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1025844 in MAAS: "INSTALL.txt mentions dnsmasq, but we now require isc-dhcp-server."
  https://bugs.launchpad.net/maas/+bug/1025844

For more details, see:
https://code.launchpad.net/~julian-edwards/maas/hacking-deps/+merge/120329

Update HACKING.txt and INSTALL.txt to reflect the latest non-Cobbler DHCP reality.
-- 
https://code.launchpad.net/~julian-edwards/maas/hacking-deps/+merge/120329
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/maas/hacking-deps into lp:maas.

=== modified file 'HACKING.txt'
--- HACKING.txt	2012-08-20 01:20:51 +0000
+++ HACKING.txt	2012-08-20 05:24:26 +0000
@@ -263,6 +263,26 @@
 and run as for TFTP.
 
 
+Configuring DHCP
+^^^^^^^^^^^^^^^^
+
+MAAS requires a properly configured DHCP server so it can boot machines using
+PXE.  MAAS works with the ISC DHCP server, install it if it's not already
+installed::
+
+    $ sudo apt-get install isc-dhcp-server
+
+There is a tool to generate a configuration that will work with MAAS::
+
+    $ maas-provision generate-dhcp-config [options]
+
+Run ``maas-provision generate-dhcp-config -h`` to see the options.  You
+will need to provide various IP details such as the low and high range to
+assign to client requests.  You can use the generated output to configure
+your system's ISC DHCP server, by putting the configuration in the
+``/etc/dhcp/dhcpd.conf`` file.
+
+
 Development services
 ====================
 

=== modified file 'INSTALL.txt'
--- INSTALL.txt	2012-08-16 11:56:16 +0000
+++ INSTALL.txt	2012-08-20 05:24:26 +0000
@@ -45,29 +45,25 @@
 Configuring a DHCP server
 =========================
 
-So that MAAS can PXE boot machines, you'll need a DHCP server. MAAS
-can work with your existing DHCP set-up but for this guide we'll use
-dnsmasq.
-
-dnsmasq should already be installed; install it if not::
-
-  $ sudo apt-get install dnsmasq
-
-Make the following configuration changes:
-
-``domain``
-  If applicable, specify your network's domain.
-
-``dhcp-range``
-  Specify the range from which dnsmasq should allocate IP
-  addresses to servers in your MAAS.
-
-``dhcp-option=3,next_server``
-  Replace ``next_server`` with the current server's IP address.
-
-Now restart dnsmasq::
-
-  $ sudo /etc/init.d/dnsmasq restart
+MAAS requires a properly configured DHCP server so it can boot machines using
+PXE.  MAAS works with the ISC DHCP server, install it if it's not already
+installed::
+
+    $ sudo apt-get install isc-dhcp-server
+
+There is a tool to generate a configuration for it that will work with MAAS::
+
+    $ maas-provision generate-dhcp-config [options]
+
+Run ``maas-provision generate-dhcp-config -h`` to see the options.  You
+will need to provide various IP details such as the low and high range to
+assign to client requests.  You can use the generated output to configure
+your system's ISC DHCP server, by putting the configuration in the
+``/etc/dhcp/dhcpd.conf`` file.
+
+Now restart dhcpd::
+
+  $ sudo /etc/init.d/isc-dhcp-server restart
 
 
 Import the Ubuntu images