Merge ~rodsmith/plainbox-provider-certification-server:update-c-c-conf into plainbox-provider-certification-server:master

[Rod Smith]

Updates to comments in /etc/xdg/canonical-certification.conf to bring it up to date with changes needed for artful and later releases.

[Jeff Lane  (bladernr)]

thanks!

review: Approve

diff --git a/configs/canonical-certification.conf b/configs/canonical-certification.conf
index 49a4ea7..a8be887 100644
--- a/configs/canonical-certification.conf
+++ b/configs/canonical-certification.conf
@@ -38,6 +38,9 @@ welcome_text = Welcome to System Certification!
 #    - This will work the same as the file:// example above and should be a
 #      full path to the cloud image.
 #
+# Note that a MAAS server set up via the MANIACS guide may optionally house
+# copies of the KVM images under http://{ip-address}/cloud/.
+#
 # UNCOMMENT EITHER OR BOTH OF THE FOLLOWING 2 LINES and set the proper
 # parameters as necessary:
 #KVM_TIMEOUT = 300
@@ -52,17 +55,21 @@ welcome_text = Welcome to System Certification!
 # 
 # Note: You must provide a full URL to the files for LXD even if they're stored
 # locally.  The following examples demonstrate proper URLs for this section:
-#  - http://someotherserver.net/imagedir/ubuntu/lxd-rootfs-filename.tar.xz
-#    - This will tell the script to download the file mycloudimg.img from the
-#      remote server.
-#  - file:///local/path/to/lxd-templates-filename.tar.xz
+#  - http://someotherserver.net/imagedir/ubuntu/server-cloudimg-amd64.squashfs
+#    - This will tell the script to download the file server-cloudimg-amd64.squashfs
+#      from the remote server.
+#  - file:///local/path/to/server-cloudimg-amd64-lxd.tar.xz
 #    - This will tell the script to look at the path specified on the local
-#      filesystem for a copy of the cloud image to use. 
+#      filesystem for server-cloudimg-amd64-lxd.tar.xz to use.
+#
+# Note that a MAAS server set up via the MANIACS guide may optionally house
+# copies of the LXD images under http://{ip-address}/cloud/.
+#
 # UNCOMMENT BOTH OF THE FOLLOWING 2 LINES nad set the proper URLs as necessary
 # OR leave them commented out and the LXD test will obtain the needed images
-# from linuxcontiners.org.
-#LXD_ROOTFS = http://server_url/path/to/lxd-rootfs-filename.tar.xz
-#LXD_TEMPLATE = http://server_url/path/to/lxd-templates-filename.tar.xz
+# from cloud-images.ubuntu.com.
+#LXD_ROOTFS = http://server_url/path/to/bionic-server-cloudimg-amd64.squashfs
+#LXD_TEMPLATE = http://server_url/path/to/bionic-server-cloudimg-amd64-lxd.tar.xz
 
 # For network testing:
 #