Merge lp:~andreserl/maas/packaging.utopic.rev331 into lp:~maas-maintainers/maas/packaging.utopic

[Andres Rodriguez]

Backporting packaging change rev331

[lp:~andreserl/maas/packaging.utopic.rev331]

343. By Andres Rodriguez on 2014-12-03

update changelog

[Andres Rodriguez (andreserl)]

self approve.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-14 13:54:23 +0000
+++ debian/changelog	2014-12-03 19:30:26 +0000
@@ -1,3 +1,13 @@
+maas (1.7.1~rc1+bzr3300-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream release, 1.7.1
+
+  [ Jeroen Vermeulen ]
+  * debian/maas-cluster-controller.postinst: configure MAAS_URL through new
+    "maas-provision configure-maas-url" sub-command instead of with "sed".
+
+ -- Andres Rodriguez <[e-mail]>  Fri, 14 Nov 2014 09:04:29 -0500
+
 maas (1.7.0+bzr3299-0ubuntu1) utopic; urgency=medium
 
   * New upstream release, 1.7.0.

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2014-11-06 14:25:26 +0000
+++ debian/maas-cluster-controller.postinst	2014-12-03 19:30:26 +0000
@@ -112,16 +112,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
 }
 
@@ -146,7 +141,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