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

[Andres Rodriguez]

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.

[Andres Rodriguez (andreserl)]

selfie!

review: Approve

=== 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 @@
-maas (1.8.0+bzr4016-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.8.1+bzr4019-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Raphaël Badin ]
   * Enable proxy_wstunnel module.
@@ -7,7 +7,10 @@
 
   [ Andres Rodriguez ]
   * Refactor maas-dns upgrade code so it doesn't break local DNS config
-    and it gets migrated (LP: #1413388)* 
+    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.
 
  -- Andres Rodriguez <[e-mail]>  Mon, 06 Jul 2015 23:52:59 -0400
 

=== 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 @@
 
 Package: maas-region-controller
 Architecture: all
-Depends: maas-region-controller-min (= ${binary:Version}),
+Depends: maas-dns (= ${binary:Version}),
+         maas-region-controller-min (= ${binary:Version}),
          postgresql (>= 9.1),
          ${misc:Depends},
          ${python:Depends}
-Recommends: openssh-server, maas-dns (= ${binary:Version})
+Recommends: openssh-server
 Description: MAAS server complete region controller
  This package installs and configures the complete MAAS region controller,
  including the minimum setup, plus the database server and messaging queue.

=== 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 @@
 	db_get maas-region-controller/dbconfig-install
 	if [ "$RET" = "true" ]; then
 		maas_sync_migrate_db
+		configure_migrate_maas_dns
 	fi
 
 	# Display installation note