Merge lp:~jtv/maas/pkg-bug-1373261 into lp:~maas-maintainers/maas/packaging

[Jeroen T. Vermeulen]

Use the new ‘maas-provision configure-maas-url’ command to (re)configure MAAS_URL, instead of shell code.

Fixes corruption in pserv.yaml when the URL uses an IPv6 host address.

This requires the accompanying code change: https://code.launchpad.net/~jtv/maas/bug-1373261/+merge/241123

Jeroen

[Gavin Panella (allenap)]

Phew.

review: Approve

[Jeroen T. Vermeulen (jtv)]

...And it works in practice too. Now that the trunk branch has landed, I've updated the changelog with the required revision number.

[MAAS Lander (maas-lander)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

[Jeroen T. Vermeulen (jtv)]

The MP wasn't aware of the changelog update...

[Julian Edwards (julian-edwards)]

On Monday 10 Nov 2014 13:00:35 you wrote:
> The MP wasn't aware of the changelog update...

You have to reload the MP page and make sure the branch scanner has seen the
latest revision pushed up. Easy to keep getting wrong isn't it :(

=== modified file 'debian/changelog'
--- debian/changelog	2014-10-20 22:30:43 +0000
+++ debian/changelog	2014-11-10 11:43:29 +0000
@@ -1,9 +1,13 @@
-maas (1.7.0~beta7+bzr3267-0ubuntu2) UNRELEASED; urgency=medium
+maas (1.7.0~beta7+bzr3352-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Michael McCracken ]
   * debian/maas-dns.postrm: ensure named.conf is cleaned of maas
     includes (LP: #1346538)
 
+  [ Jeroen Vermeulen ]
+  * debian/maas-cluster-controller.postinst: configure MAAS_URL through new
+    "maas-provision configure-maas-url" sub-command instead of with "sed".
+
  -- Michael McCracken <[e-mail]>  Mon, 20 Oct 2014 14:48:20 -0700
 
 maas (1.7.0~beta7+bzr3266-0ubuntu1) utopic; urgency=medium

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2014-10-14 06:55:35 +0000
+++ debian/maas-cluster-controller.postinst	2014-11-10 11:43:29 +0000
@@ -108,16 +108,11 @@
     fi
 }
 
-configure_pserv_generator(){
+configure_maas_url(){
     # Get the MAAS_URL on configure/reconfigure and write it to the conf files.
     db_get maas-cluster-controller/maas-url || true
     if [ -n "$RET" ]; then
-        sed -i "s|MAAS_URL=.*|MAAS_URL=\"$RET\"|" /etc/maas/maas_cluster.conf
-        # Extract the hostname part.
-        HOSTPART=$(echo $RET|awk '{ split($0,array,"/")} END{print array[3] }')
-        # And substitute it in-place in pserv.yaml on an indented, non-commented
-        # line.
-        sed -ri "s|^([[:space:]]+)(#+[[:space:]]*)?(generator:[[:space:]]+https?://)[^:/]+|\1\3$HOSTPART|" /etc/maas/pserv.yaml
+        maas-provision configure-maas-url "$RET"
     fi
 }
 
@@ -142,7 +137,7 @@
     fi
 
     configure_maas_tgt
-    configure_pserv_generator
+    configure_maas_url
     # Only ask for a shared secret when the region is not installed
     # on the same system.
     if [ -n "$DEBCONF_RECONFIGURE" ] && [ ! -f /usr/sbin/maas-region-admin ]; then