Merge ~rodsmith/maas-cert-server:fix-lxd-config into maas-cert-server:master

[Rod Smith]

Fix preseed file to match earlier changes to /etc/xdg/canonical-certification.conf. The lack of sync was causing auto-config of LXD options to fail.

[Jeff Lane  (bladernr)]

LGTM, thanks!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index dca821c..db3e775 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maas-cert-server (0.3.1-0ppa1) xenial; urgency=medium
+
+  * Fix to preseed file to match changes to
+    /etc/xdg/canonical-certification.conf.
+
+ -- Rod Smith <[e-mail]>  Tue, 01 May 2018 10:31:47 -0400
+
 maas-cert-server (0.3.0-0ppa1) xenial; urgency=medium
 
   * Update index.html for changes to STG filename.
diff --git a/preseed/curtin_userdata_cert b/preseed/curtin_userdata_cert
index 7dc1d05..cfa34d8 100644
--- a/preseed/curtin_userdata_cert
+++ b/preseed/curtin_userdata_cert
@@ -111,8 +111,8 @@ anchor_bucket:
           echo "Setting rootfs file to: $rootfsfile";
       fi;
       if [ ! -z "$templatefile" ] && [ ! -z "$rootfsfile" ]; then
-          sed -i "s/#LXD_ROOTFS = http:\/\/server_url\/path\/to\/lxd-rootfs-filename.tar.xz/LXD_ROOTFS = http:\/\/$maas_ip\/cloud\/$rootfsfile/g" /etc/xdg/canonical-certification.conf;
-          sed -i "s/#LXD_TEMPLATE = http:\/\/server_url\/path\/to\/lxd-templates-filename.tar.xz/LXD_TEMPLATE = http:\/\/$maas_ip\/cloud\/$templatefile/g" /etc/xdg/canonical-certification.conf;
+          sed -i "s/#LXD_ROOTFS = http:\/\/server_url\/path\/to\/bionic-server-cloudimg-amd64.squashfs/LXD_ROOTFS = http:\/\/$maas_ip\/cloud\/$rootfsfile/g" /etc/xdg/canonical-certification.conf;
+          sed -i "s/#LXD_TEMPLATE = http:\/\/server_url\/path\/to\/bionic-server-cloudimg-amd64-lxd.tar.xz/LXD_TEMPLATE = http:\/\/$maas_ip\/cloud\/$templatefile/g" /etc/xdg/canonical-certification.conf;
       fi;
       rm -f /tmp/index.html;