Merge lp:~andreserl/maas/packaging.fixes into lp:~maas-maintainers/maas/packaging.quantal

Proposed by Andres Rodriguez on 2013-01-22
Status: Merged
Approved by: Andres Rodriguez on 2013-01-22
Approved revision: 160
Merged at revision: 158
Proposed branch: lp:~andreserl/maas/packaging.fixes
Merge into: lp:~maas-maintainers/maas/packaging.quantal
Diff against target: 78 lines (+13/-4)
6 files modified
debian/changelog (+10/-1)
debian/control (+1/-1)
debian/maas-cluster-controller.install (+0/-1)
debian/maas-cluster-controller.lintian-overrides (+0/-1)
debian/maas-region-controller.install (+1/-0)
debian/maas-region-controller.lintian-overrides (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging.fixes
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2013-01-22
Review via email: mp+144410@code.launchpad.net

Commit message

maas-cluster-controller now depends on distro-info instead of maas-region-controoler.
maas-region-controller now installs commissioning-user-data

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

Approving myself as these bugs where found when testing MAAS in a distributed environment. Confirming that these fixes work.

review: Approve
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 2013-01-16 18:07:26 +0000
3+++ debian/changelog 2013-01-22 23:00:32 +0000
4@@ -1,4 +1,13 @@
5-maas (1.2+bzr1349+dfsg-0ubuntu1) UNRELEASED; urgency=low
6+maas (1.2+bzr1349+dfsg-0ubuntu2) UNRELEASED; urgency=low
7+
8+ * debian/control: Depends on distro-info for maas-cluster-controller
9+ instead of maas-region-controller (LP: #1103194)
10+ * debian/maas-region-controller.install: Install commissioning-user-data
11+ instead of maas-cluster-controller. (LP: #1103203)
12+
13+ -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 22 Jan 2013 17:51:26 -0500
14+
15+maas (1.2+bzr1349+dfsg-0ubuntu1) raring; urgency=low
16
17 * New upstream bugfix release. Fixes:
18 - The DNS configuration is not created if maas-dns is installed after
19
20=== modified file 'debian/control'
21--- debian/control 2013-01-16 18:07:26 +0000
22+++ debian/control 2013-01-22 23:00:32 +0000
23@@ -54,7 +54,6 @@
24 Depends: apache2,
25 avahi-daemon,
26 dbconfig-common,
27- distro-info,
28 libapache2-mod-wsgi,
29 libjs-raphael,
30 libjs-yui3-full,
31@@ -167,6 +166,7 @@
32 Package: maas-cluster-controller
33 Architecture: all
34 Depends: bind9utils,
35+ distro-info,
36 freeipmi-tools,
37 maas-cli (=${binary:Version}),
38 maas-common (=${binary:Version}),
39
40=== modified file 'debian/maas-cluster-controller.install'
41--- debian/maas-cluster-controller.install 2012-11-20 22:13:28 +0000
42+++ debian/maas-cluster-controller.install 2013-01-22 23:00:32 +0000
43@@ -20,7 +20,6 @@
44 debian/tmp/etc/maas/import_pxe_files
45 debian/tmp/usr/sbin/maas-import-ephemerals
46 debian/tmp/etc/maas/import_ephemerals
47-debian/tmp/etc/maas/commissioning-user-data
48 # Obsolete, but still available for compatibility:
49 scripts/maas-import-isos usr/sbin
50
51
52=== modified file 'debian/maas-cluster-controller.lintian-overrides'
53--- debian/maas-cluster-controller.lintian-overrides 2013-01-16 18:07:26 +0000
54+++ debian/maas-cluster-controller.lintian-overrides 2013-01-22 23:00:32 +0000
55@@ -1,3 +1,2 @@
56 maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals
57 maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos
58-maas-cluster-controller: script-not-executable etc/maas/commissioning-user-data
59
60=== modified file 'debian/maas-region-controller.install'
61--- debian/maas-region-controller.install 2012-11-20 22:13:28 +0000
62+++ debian/maas-region-controller.install 2013-01-22 23:00:32 +0000
63@@ -26,6 +26,7 @@
64 debian/tmp/usr/share/maas/preseeds
65
66 # Install all other stuff
67+debian/tmp/etc/maas/commissioning-user-data
68 debian/extras/maas usr/sbin
69 debian/extras/maas-region-celeryd usr/sbin
70 debian/extras/20-maas.conf etc/rsyslog.d
71
72=== modified file 'debian/maas-region-controller.lintian-overrides'
73--- debian/maas-region-controller.lintian-overrides 2013-01-16 18:07:26 +0000
74+++ debian/maas-region-controller.lintian-overrides 2013-01-22 23:00:32 +0000
75@@ -1,2 +1,3 @@
76 maas-region-controller: binary-without-manpage usr/sbin/maas
77 maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd
78+maas-cluster-controller: script-not-executable etc/maas/commissioning-user-data

Subscribers

People subscribed via source and target branches