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

Proposed by Andres Rodriguez on 2015-07-13
Status: Merged
Approved by: Andres Rodriguez on 2015-07-13
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 on 2015-07-13
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.
Andres Rodriguez (andreserl) wrote :

selfie!

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 2015-07-07 03:54:03 +0000
3+++ debian/changelog 2015-07-13 15:10:33 +0000
4@@ -1,4 +1,4 @@
5-maas (1.8.0+bzr4016-0ubuntu1) UNRELEASED; urgency=medium
6+maas (1.8.1+bzr4019-0ubuntu1) UNRELEASED; urgency=medium
7
8 [ Raphaƫl Badin ]
9 * Enable proxy_wstunnel module.
10@@ -7,7 +7,10 @@
11
12 [ Andres Rodriguez ]
13 * Refactor maas-dns upgrade code so it doesn't break local DNS config
14- and it gets migrated (LP: #1413388)*
15+ and it gets migrated (LP: #1413388)
16+ - debian/maas-region-controller.postinst: Ensure DNS config migration
17+ is always run.
18+ * debian/control: Make maas-dns a Dependy of maas-region-controller.
19
20 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 06 Jul 2015 23:52:59 -0400
21
22
23=== modified file 'debian/control'
24--- debian/control 2015-07-01 08:07:14 +0000
25+++ debian/control 2015-07-13 15:10:33 +0000
26@@ -77,11 +77,12 @@
27
28 Package: maas-region-controller
29 Architecture: all
30-Depends: maas-region-controller-min (= ${binary:Version}),
31+Depends: maas-dns (= ${binary:Version}),
32+ maas-region-controller-min (= ${binary:Version}),
33 postgresql (>= 9.1),
34 ${misc:Depends},
35 ${python:Depends}
36-Recommends: openssh-server, maas-dns (= ${binary:Version})
37+Recommends: openssh-server
38 Description: MAAS server complete region controller
39 This package installs and configures the complete MAAS region controller,
40 including the minimum setup, plus the database server and messaging queue.
41
42=== modified file 'debian/maas-region-controller.postinst'
43--- debian/maas-region-controller.postinst 2015-07-07 21:45:07 +0000
44+++ debian/maas-region-controller.postinst 2015-07-13 15:10:33 +0000
45@@ -104,6 +104,7 @@
46 db_get maas-region-controller/dbconfig-install
47 if [ "$RET" = "true" ]; then
48 maas_sync_migrate_db
49+ configure_migrate_maas_dns
50 fi
51
52 # Display installation note

Subscribers

People subscribed via source and target branches