MAAS

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

  1. packaging.fixes
  2. Merge into packaging.quantal
Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: no longer in the source branch.
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
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.
Revision history for this message
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
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-01-16 18:07:26 +0000
+++ debian/changelog 2013-01-22 23:00:32 +0000
@@ -1,4 +1,13 @@
1maas (1.2+bzr1349+dfsg-0ubuntu1) UNRELEASED; urgency=low1maas (1.2+bzr1349+dfsg-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/control: Depends on distro-info for maas-cluster-controller
4 instead of maas-region-controller (LP: #1103194)
5 * debian/maas-region-controller.install: Install commissioning-user-data
6 instead of maas-cluster-controller. (LP: #1103203)
7
8 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 22 Jan 2013 17:51:26 -0500
9
10maas (1.2+bzr1349+dfsg-0ubuntu1) raring; urgency=low
211
3 * New upstream bugfix release. Fixes:12 * New upstream bugfix release. Fixes:
4 - The DNS configuration is not created if maas-dns is installed after13 - The DNS configuration is not created if maas-dns is installed after
514
=== modified file 'debian/control'
--- debian/control 2013-01-16 18:07:26 +0000
+++ debian/control 2013-01-22 23:00:32 +0000
@@ -54,7 +54,6 @@
54Depends: apache2,54Depends: apache2,
55 avahi-daemon,55 avahi-daemon,
56 dbconfig-common,56 dbconfig-common,
57 distro-info,
58 libapache2-mod-wsgi,57 libapache2-mod-wsgi,
59 libjs-raphael,58 libjs-raphael,
60 libjs-yui3-full,59 libjs-yui3-full,
@@ -167,6 +166,7 @@
167Package: maas-cluster-controller166Package: maas-cluster-controller
168Architecture: all167Architecture: all
169Depends: bind9utils,168Depends: bind9utils,
169 distro-info,
170 freeipmi-tools,170 freeipmi-tools,
171 maas-cli (=${binary:Version}),171 maas-cli (=${binary:Version}),
172 maas-common (=${binary:Version}),172 maas-common (=${binary:Version}),
173173
=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install 2012-11-20 22:13:28 +0000
+++ debian/maas-cluster-controller.install 2013-01-22 23:00:32 +0000
@@ -20,7 +20,6 @@
20debian/tmp/etc/maas/import_pxe_files20debian/tmp/etc/maas/import_pxe_files
21debian/tmp/usr/sbin/maas-import-ephemerals21debian/tmp/usr/sbin/maas-import-ephemerals
22debian/tmp/etc/maas/import_ephemerals22debian/tmp/etc/maas/import_ephemerals
23debian/tmp/etc/maas/commissioning-user-data
24# Obsolete, but still available for compatibility:23# Obsolete, but still available for compatibility:
25scripts/maas-import-isos usr/sbin24scripts/maas-import-isos usr/sbin
2625
2726
=== modified file 'debian/maas-cluster-controller.lintian-overrides'
--- debian/maas-cluster-controller.lintian-overrides 2013-01-16 18:07:26 +0000
+++ debian/maas-cluster-controller.lintian-overrides 2013-01-22 23:00:32 +0000
@@ -1,3 +1,2 @@
1maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals1maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals
2maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos2maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos
3maas-cluster-controller: script-not-executable etc/maas/commissioning-user-data
43
=== modified file 'debian/maas-region-controller.install'
--- debian/maas-region-controller.install 2012-11-20 22:13:28 +0000
+++ debian/maas-region-controller.install 2013-01-22 23:00:32 +0000
@@ -26,6 +26,7 @@
26debian/tmp/usr/share/maas/preseeds26debian/tmp/usr/share/maas/preseeds
2727
28# Install all other stuff28# Install all other stuff
29debian/tmp/etc/maas/commissioning-user-data
29debian/extras/maas usr/sbin30debian/extras/maas usr/sbin
30debian/extras/maas-region-celeryd usr/sbin31debian/extras/maas-region-celeryd usr/sbin
31debian/extras/20-maas.conf etc/rsyslog.d32debian/extras/20-maas.conf etc/rsyslog.d
3233
=== modified file 'debian/maas-region-controller.lintian-overrides'
--- debian/maas-region-controller.lintian-overrides 2013-01-16 18:07:26 +0000
+++ debian/maas-region-controller.lintian-overrides 2013-01-22 23:00:32 +0000
@@ -1,2 +1,3 @@
1maas-region-controller: binary-without-manpage usr/sbin/maas1maas-region-controller: binary-without-manpage usr/sbin/maas
2maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd2maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd
3maas-cluster-controller: script-not-executable etc/maas/commissioning-user-data

Subscribers

People subscribed via source and target branches