Merge lp:~andreserl/maas/packaging_templates into lp:~maas-maintainers/maas/packaging

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 514
Merged at revision: 515
Proposed branch: lp:~andreserl/maas/packaging_templates
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 34 lines (+1/-8)
3 files modified
debian/changelog (+1/-1)
debian/maas-rack-controller.install (+0/-4)
debian/maas-region-api.install (+0/-3)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_templates
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+303973@code.launchpad.net

Commit message

Do no longer manually install templaes, now they are part of provisioningserver.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2016-08-15 11:21:11 +0000
3+++ debian/changelog 2016-08-25 17:47:12 +0000
4@@ -1,4 +1,4 @@
5-maas (2.1.0~alpha1+bzr5222-0ubuntu1) UNRELEASED; urgency=medium
6+maas (2.1.0~alpha1+bzr5294-0ubuntu1) UNRELEASED; urgency=medium
7
8 * Give MAAS on both region and rack the ability to start, restart, and
9 get the status of the local NTP service.
10
11=== modified file 'debian/maas-rack-controller.install'
12--- debian/maas-rack-controller.install 2016-07-18 23:28:26 +0000
13+++ debian/maas-rack-controller.install 2016-08-25 17:47:12 +0000
14@@ -1,7 +1,3 @@
15-# Install templates
16-debian/tmp/etc/maas/templates/pxe
17-debian/tmp/etc/maas/templates/uefi
18-
19 # Install uec2roottar
20 debian/tmp/usr/bin/uec2roottar
21
22
23=== modified file 'debian/maas-region-api.install'
24--- debian/maas-region-api.install 2016-06-13 21:22:58 +0000
25+++ debian/maas-region-api.install 2016-08-25 17:47:12 +0000
26@@ -10,9 +10,6 @@
27 # Install new preseed files
28 debian/tmp/etc/maas/preseeds
29
30-# Install templates
31-debian/tmp/etc/maas/templates/commissioning-user-data
32-
33 # Install driver configuration file
34 debian/tmp/etc/maas/drivers.yaml
35

Subscribers

People subscribed via source and target branches

to all changes: