Merge lp:~julian-edwards/maas/packaging-install-drivers-yaml into lp:~maas-maintainers/maas/packaging

Proposed by Julian Edwards
Status: Merged
Approved by: Julian Edwards
Approved revision: 270
Merged at revision: 270
Proposed branch: lp:~julian-edwards/maas/packaging-install-drivers-yaml
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 33 lines (+10/-2)
2 files modified
debian/changelog (+7/-2)
debian/maas-region-controller-min.install (+3/-0)
To merge this branch: bzr merge lp:~julian-edwards/maas/packaging-install-drivers-yaml
Reviewer Review Type Date Requested Status
Scott Moser (community) Approve
Review via email: mp+215344@code.launchpad.net

Commit message

Ensure drivers.yaml is installed in the region controller.

To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

looks good to me assuming it builds to actually have the file in the package.

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

FYI... I had fixed this already and the branch including the upload already included this, and this is what was uploaded. See https://code.launchpad.net/~andreserl/maas/pkg_release_bzr2240

Revision history for this message
Andres Rodriguez (andreserl) wrote :

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 2014-04-09 23:02:21 +0000
3+++ debian/changelog 2014-04-11 03:40:06 +0000
4@@ -1,8 +1,13 @@
5-maas (1.5+bzr2236-0ubuntu2) UNRELEASED; urgency=medium
6+maas (1.5+bzr2241-0ubuntu1) UNRELEASED; urgency=medium
7
8+ [ Andres Rodriguez ]
9 * UNRELEASED
10
11- -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 09 Apr 2014 19:02:00 -0400
12+ [ Julian Edwards ]
13+ * debian/maas-region-controller-min.install: Ensure drivers.yaml is
14+ installed.
15+
16+ -- Julian Edwards <julian.edwards@canonical.com> Fri, 11 Apr 2014 13:34:47 +1000
17
18 maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium
19
20
21=== modified file 'debian/maas-region-controller-min.install'
22--- debian/maas-region-controller-min.install 2014-02-12 05:46:08 +0000
23+++ debian/maas-region-controller-min.install 2014-04-11 03:40:06 +0000
24@@ -29,6 +29,9 @@
25 debian/tmp/etc/maas/templates/dns
26 debian/tmp/etc/maas/templates/commissioning-user-data
27
28+# Install driver configuration file
29+debian/tmp/etc/maas/drivers.yaml
30+
31 # Install all other stuff
32 debian/extras/maas-region-admin usr/sbin
33 debian/extras/maas-region-celeryd usr/sbin

Subscribers

People subscribed via source and target branches