Merge lp:~andreserl/maas/packaging_lp1413388_1.8 into lp:~maas-maintainers/maas/packaging-1.8

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 411
Merged at revision: 411
Proposed branch: lp:~andreserl/maas/packaging_lp1413388_1.8
Merge into: lp:~maas-maintainers/maas/packaging-1.8
Diff against target: 52 lines (+9/-4)
3 files modified
debian/changelog (+5/-2)
debian/control (+3/-2)
debian/maas-region-controller.postinst (+1/-0)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_lp1413388_1.8
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+264588@code.launchpad.net

Commit message

and it gets migrated (LP: #1413388)
  - debian/maas-region-controller.postinst: Ensure DNS config migration
    is always run.
* debian/control: Make maas-dns a Dependy of maas-region-controller.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

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 2015-07-07 03:54:03 +0000
+++ debian/changelog 2015-07-13 15:10:33 +0000
@@ -1,4 +1,4 @@
1maas (1.8.0+bzr4016-0ubuntu1) UNRELEASED; urgency=medium1maas (1.8.1+bzr4019-0ubuntu1) UNRELEASED; urgency=medium
22
3 [ Raphaël Badin ]3 [ Raphaël Badin ]
4 * Enable proxy_wstunnel module.4 * Enable proxy_wstunnel module.
@@ -7,7 +7,10 @@
77
8 [ Andres Rodriguez ]8 [ Andres Rodriguez ]
9 * Refactor maas-dns upgrade code so it doesn't break local DNS config9 * Refactor maas-dns upgrade code so it doesn't break local DNS config
10 and it gets migrated (LP: #1413388)* 10 and it gets migrated (LP: #1413388)
11 - debian/maas-region-controller.postinst: Ensure DNS config migration
12 is always run.
13 * debian/control: Make maas-dns a Dependy of maas-region-controller.
1114
12 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 06 Jul 2015 23:52:59 -040015 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 06 Jul 2015 23:52:59 -0400
1316
1417
=== modified file 'debian/control'
--- debian/control 2015-07-01 08:07:14 +0000
+++ debian/control 2015-07-13 15:10:33 +0000
@@ -77,11 +77,12 @@
7777
78Package: maas-region-controller78Package: maas-region-controller
79Architecture: all79Architecture: all
80Depends: maas-region-controller-min (= ${binary:Version}),80Depends: maas-dns (= ${binary:Version}),
81 maas-region-controller-min (= ${binary:Version}),
81 postgresql (>= 9.1),82 postgresql (>= 9.1),
82 ${misc:Depends},83 ${misc:Depends},
83 ${python:Depends}84 ${python:Depends}
84Recommends: openssh-server, maas-dns (= ${binary:Version})85Recommends: openssh-server
85Description: MAAS server complete region controller86Description: MAAS server complete region controller
86 This package installs and configures the complete MAAS region controller,87 This package installs and configures the complete MAAS region controller,
87 including the minimum setup, plus the database server and messaging queue.88 including the minimum setup, plus the database server and messaging queue.
8889
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst 2015-07-07 21:45:07 +0000
+++ debian/maas-region-controller.postinst 2015-07-13 15:10:33 +0000
@@ -104,6 +104,7 @@
104 db_get maas-region-controller/dbconfig-install104 db_get maas-region-controller/dbconfig-install
105 if [ "$RET" = "true" ]; then105 if [ "$RET" = "true" ]; then
106 maas_sync_migrate_db106 maas_sync_migrate_db
107 configure_migrate_maas_dns
107 fi108 fi
108109
109 # Display installation note110 # Display installation note

Subscribers

People subscribed via source and target branches