Merge lp:~allenap/maas/packaging.cluster-pserv-address-bug-1081212-part-2-the-revenge into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Remove leading comment markers from the 'generator' line in pserv.yaml during cluster postinst.

[Raphaël Badin (rvb)]

Looks good. I've tested the sed command on a real-world config file for confirmation.

This will need to be backported to quantal and precise.

review: Approve

[lp:~allenap/maas/packaging.cluster-pserv-address-bug-1081212-part-2-the-revenge]

153. By Gavin Panella on 2012-11-27

Merge trunk.

[Julian Edwards (julian-edwards)]

This will break/not work if someone has done this:

## TFTP configuration.
#
tftp:
  # root: /var/lib/maas/tftp
  # port: 69
  ## The URL to be contacted to generate PXE configurations.
  # generator: http://localhost/MAAS/api/1.0/pxeconfig/
generator: http://somewhere/MAAS/api/1.0/pxeconfig/

I suggest first looking for a line without the comment, and if there isn't one, add it, before doing what the postinst originally did.

review: Needs Fixing

[Julian Edwards (julian-edwards)]

Also this fails to update a line like this:

# generator: http://foo:5243/api/1.0/pxeconfig/

[Julian Edwards (julian-edwards)]

I'm going to backport this to 1.2 on the understanding that it fixes the "as shipped" case right now. If someone is editing config manually I guess they may break it.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-27 11:53:02 +0000
+++ debian/changelog	2012-11-27 14:15:36 +0000
@@ -37,6 +37,8 @@
     configuration file are no longer part of upstream.
   * debian/maas-cluster-controller.install: The maas-import-pxe-files cron
     task is no longer used.
+  * debian/maas-cluster-controller.postinst: Remove leading comment
+    markers from the 'generator' line in pserv.yaml.
 
   [ Andres Rodriguez ]
   * debian/control:

=== modified file 'debian/maas-cluster-controller.postinst'
--- debian/maas-cluster-controller.postinst	2012-11-27 11:53:02 +0000
+++ debian/maas-cluster-controller.postinst	2012-11-27 14:15:36 +0000
@@ -57,9 +57,9 @@
         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.conf on an indented, non-commented
+        # And substitute it in-place in pserv.yaml on an indented, non-commented
         # line.
-        sed -ri "s|^([[:space:]]+generator:[[:space:]]+https?://)[^:/]+|\1$HOSTPART|" /etc/maas/pserv.yaml
+        sed -ri "s|^([[:space:]]+)(#+[[:space:]]*)?(generator:[[:space:]]+https?://)[^:/]+|\1\3$HOSTPART|" /etc/maas/pserv.yaml
     fi
 fi