← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~jtv/maas/pkg-move-userdata-templates-to-etc into lp:~maas-maintainers/maas/packaging

 

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

Commit message:
Packaging change: install user-data templates and snippets to /etc/maas/templates/user-data/.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

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

In this case, there is a subdirectory "snippets" inside the new config directory, /etc/maas/templates/user-data/, but it all gets installed exactly as expected.

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


Jeroen
-- 
https://code.launchpad.net/~jtv/maas/pkg-move-userdata-templates-to-etc/+merge/167280
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/maas/pkg-move-userdata-templates-to-etc into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install	2013-06-03 23:38:46 +0000
+++ debian/maas-region-controller.install	2013-06-04 14:07:15 +0000
@@ -27,6 +27,7 @@
 
 # Install templates
 debian/tmp/etc/maas/templates/dns
+debian/tmp/etc/maas/templates/user-data
 
 # Install all other stuff
 debian/extras/maas usr/sbin


Follow ups