launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/maas/pkg-move-dhcp-templates-to-etc into lp:~maas-maintainers/maas/packaging.

Commit message:
Packaging change: install DHCP template to /etc/maas/templates/dhcp/.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jtv/maas/pkg-move-dhcp-templates-to-etc/+merge/167114

This accompanies the trunk change in https://code.launchpad.net/~jtv/maas/move-dhcp-templates-to-etc/+merge/167109 and follows the same coupled-branches pattern as I used for the PXE templates.

Once both branches have been approved, I'll land that trunk change and in this packaging branch, update debian/changelog to match its revision.

You may wonder why I'm choosing to install the dhcp template with the maas-cluster-controller package, not with maas-dhcp.  But even when maas-dhcp is not installed, we still *generate* the DHCP configuration, and so still require the template.  I sanity-checked this with Andres.


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/pkg-move-dhcp-templates-to-etc/+merge/167114
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/pkg-move-dhcp-templates-to-etc into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2013-06-03 17:47:25 +0000
+++ debian/changelog	2013-06-03 18:16:26 +0000
@@ -20,8 +20,7 @@
 
   [ Jeroen Vermeulen ]
   * In the source tree, /etc/maas/pserv.yaml has moved from etc/ to etc/maas/.
-  * Install PXE templates into /etc/maas/templates/pxe/.
-  * Install power templates and config into /etc/maas/templates/power/.
+  * Install templates into /etc/maas/templates/.
 
  -- Julian Edwards <julian.edwards@xxxxxxxxxxxxx>  Tue, 28 May 2013 09:41:57 +1000
 

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2013-06-03 17:15:52 +0000
+++ debian/maas-cluster-controller.install	2013-06-03 18:16:26 +0000
@@ -14,6 +14,7 @@
 debian/tmp/etc/maas/maas_local_celeryconfig_cluster.py
 
 # Install templates
+debian/tmp/etc/maas/templates/dhcp
 debian/tmp/etc/maas/templates/power
 debian/tmp/etc/maas/templates/pxe