Merge lp:~andreserl/maas/fix_lp1553648 into lp:~maas-maintainers/maas/packaging

[Andres Rodriguez]

Fix issue handling package removal and dbconfig-common

[MAAS Lander (maas-lander)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0. Got: 1 Pending.

[Mike Pontillo (mpontillo)]

I read through the thread with Paul here:

https://bugs.launchpad.net/ubuntu/+source/dbconfig-common/+bug/1553757

Just so I understand, why was checking for /etc/dbconfig-common/maas.conf causing a problem? (I guess dbconfig didn't get to fully clean up if the configuration file still existed?)

What do you think about Paul's suggestion to do this to avoid prompting? (might be important for HA?)

    dbc_prio_high=medium

Since it sounds like you've tested this pretty well, I'll go ahead and approve. I have noticed odd dbconfig behavior while purging MAAS before as well, and this change does seem like a good step toward sanity.

review: Approve

[Andres Rodriguez (andreserl)]

CHecking for a non-existant file caused MAAS to not really de-register it from the dbconfig/ucf db, hence things that shouldn'y have been there.

So I'll look into the prio thing but wont add it until I get some real testing.

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-07 21:09:20 +0000
+++ debian/changelog	2016-03-10 01:52:36 +0000
@@ -1,14 +1,18 @@
-maas (2.0.0~alpha1+bzr4741-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.0.0~alpha2+bzr4760-0ubuntu1) UNRELEASED; urgency=medium
 
-  * New usptream release, 2.0.0 bzr 4741.
+  * New usptream release, 2.0.0 bzr 4760 (LP: #1553261).
   * maas-dns Depends: bind9 >= 1:9.10.3.dfsg.P2-5 for better system time.
     LP: #1553176.
+  * debian/extras/maas-{region,rack}: Replace maas-region-admin
+    and maas-provision, respectively (LP: #1553791)
+  * debian/maas-region-controller.postrm: Correctly handle removal by
+    dbconfig-common. (LP: #1553648)
 
  -- Andres Rodriguez <[e-mail]>  Mon, 01 Feb 2016 18:18:52 +0100
 
-maas (2.0.0~alpha1+bzr4736-0ubuntu1~xenial2) xenial; urgency=medium
+maas (2.0.0~alpha1+bzr4736-0ubuntu1) xenial; urgency=medium
 
-  * New usptream release, 2.0.0 bzr 4736:
+  * New usptream release, 2.0.0 bzr 4736 (LP: #1553261):
     - Deprecate Cluster Controllers in favor of Rack Controllers.
     - Deprecate API 1.0 in favor if API 2.0.
     - DHCP & Rack Controller High Availability.
@@ -20,8 +24,6 @@
   * Allow 'dhcpd' to access /usr/sbin/maas-provision via
     sudoers file (LP: #1552775)
   * debian/extras/maas: Replace shell wrapper with python. (LP: #1553605)
-  * debian/extras/maas-{region,rack}: Replace maas-region-admin
-    and maas-provision, respectively (LP: #1553791)
   * debian/control: Depends on iproute2 instead. (LP: #1553647)
 
  -- Andres Rodriguez <[e-mail]>  Mon, 01 Feb 2016 18:18:52 +0100
 
=== modified file 'debian/maas-region-controller.postrm'
--- debian/maas-region-controller.postrm	2015-07-03 14:26:39 +0000
+++ debian/maas-region-controller.postrm	2016-03-10 01:52:36 +0000
@@ -6,11 +6,9 @@
 
 RELEASE=`lsb_release -rs` ||  RELEASE=""
 
-if [ -f /etc/dbconfig-common/maas.conf ]; then
-    if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
-        . /usr/share/dbconfig-common/dpkg/postrm.pgsql
-        dbc_go maas-region-controller $@
-    fi
+if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
+    . /usr/share/dbconfig-common/dpkg/postrm.pgsql
+    dbc_go maas-region-controller $@
 fi
 
 case "$1" in