Merge ~bladernr/plainbox-provider-certification-server:1621986-modify-config into plainbox-provider-certification-server:master

[Jeff Lane ]

Modify config file to reflect changes in the virtualization script per this MERGE:
https://code.launchpad.net/~bladernr/checkbox/1621986-virt-accept-urls

[Rod Smith (rodsmith)]

A couple of typos and formatting suggestions, as well as one to alter an example.

review: Needs Fixing

[Jeff Lane  (bladernr)]

Thanks for the catch on those. I've updated accordingly.

review: Needs Resubmitting

[Rod Smith (rodsmith)]

Looks good!

review: Approve

[Sylvain Pineau (sylvain-pineau)]

+1, thanks

review: Approve

diff --git a/configs/canonical-certification.conf b/configs/canonical-certification.conf
index c6b2248..fccd579 100644
--- a/configs/canonical-certification.conf
+++ b/configs/canonical-certification.conf
@@ -20,12 +20,26 @@ welcome_text = Welcome to System Certification!
 #
 # KVM_TIMEOUT sets the timeout to wait for the cloudimg to boot before exiting
 # test. It is an integer in seconds (the default is 3000 seconds)
-# KVM_IMAGE is the path to the local copy of the cloud image to use for
-# testing.  This is necessary if you are in a disconnected environment and have
-# a copy of the cloudimg file on your SUT's local filesystem.  This should be a
-# full path.
+# KVM_IMAGE the location to find the cloud image to use for testing KVM.  This
+# will allow you to specify a variety of location options depending on your
+# needs.  
+# Options available:
+#  - http://myserver.com/imagedir/ (note the trailing / is required!!)
+#    - This will tell the script to look into /imagedir/ on the remote server
+#      for files in the standard ubuntu Cloud filename format
+#      RELEASE-server-cloudimg-ARCH-disk1.img
+#  - http://someotherserver.net/imagedir/ubuntu/mycloudimg.img
+#    - This will tell the script to download the file mycloudimg.img from the
+#      remote server.
+#  - file:///local/path/to/cloud.img
+#    - This will tell the script to look at the path specified on the local
+#      filesystem for a copy of the cloud image to use.
+#  - /local/path/to/cloud.img
+#    - This will work the same as the file:// example above and should be a
+#      full path to the cloud image.
 #
-# UNCOMMENT THE FOLLOWING 2 LINES and set the proper parameters as necessary:
+# UNCOMMENT EITHER OR BOTH OF THE FOLLOWING 2 LINES and set the proper
+# parameters as necessary:
 #KVM_TIMEOUT = 300
 #KVM_IMAGE = /path/to/cloudimage-filename.img