Merge ~bladernr/plainbox-provider-certification-server:1738805-clear-up-url-expectations into plainbox-provider-certification-server:master

[Jeff Lane ]

Made the text about LXD images and URLs more explanatory.
Removed unnecessary return statements in precheck that were preventing second half of the LXD check from running in some cases.

Tested locally.

[Sylvain Pineau (sylvain-pineau)]

Looks good, +1

review: Approve

diff --git a/configs/canonical-certification.conf b/configs/canonical-certification.conf
index a696c05..49a4ea7 100644
--- a/configs/canonical-certification.conf
+++ b/configs/canonical-certification.conf
@@ -49,6 +49,18 @@ welcome_text = Welcome to System Certification!
 # LXD containers.
 # LXD_TEMPLATES is the tarball that contains the LXD templates and YAML
 # necessary for defining containers
+# 
+# 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
+#    - This will tell the script to look at the path specified on the local
+#      filesystem for a copy of the cloud image to use. 
+# 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
 
@@ -56,5 +68,6 @@ welcome_text = Welcome to System Certification!
 #
 # TEST_TARGET_IPERF is the IP/Hostname of the iperf server for network testing.
 #
-# UNCOMMENT THE FOLLOWING LINE and set the proper parameters as necessary:
+# UNCOMMENT THE FOLLOWING LINE and set the IP/Hostname of your iperf target
+# system as necessary:
 #TEST_TARGET_IPERF =  your-iperf-server.example.com
diff --git a/tools/canonical-certification-precheck b/tools/canonical-certification-precheck
index 0e802eb..408270f 100755
--- a/tools/canonical-certification-precheck
+++ b/tools/canonical-certification-precheck
@@ -389,8 +389,8 @@ if grep "^LXD_TEMPLATE =" /etc/xdg/canonical-certification.conf >/dev/null; then
         echo -e " $templateurl is a valid url.\n Continuing to use this template file"
         pass
     else
-        echo -e " NOTE: For the following, you must provide a valid URL beginning with http://,"
-        echo -e "       https://, or file://"
+        echo -e " NOTE: For the following, YOU MUST PROVIDE A VALID URL beginning with http://,"
+        echo -e "       https://, or file://. A filesystem PATH is NOT valid here:"
 	    echo -e " $templateurl is not a valid url.\n Would you like to reconfigure it now? [Y/n]"
         read -s -N1 a
         if [[ $a == "Y" || $a == "y" || -z $a ]]; then
@@ -400,11 +400,9 @@ if grep "^LXD_TEMPLATE =" /etc/xdg/canonical-certification.conf >/dev/null; then
             if curl --output /dev/null --silent --head -fail "$templateurl"; then
                 echo -e " $templateurl is a valid url.\n Continuing to use this template file"
                 pass
-                return 0
             else
 	            echo -e " We cannot get the LXD template image from $templateurl.\n Marking as failed"
 	            fail
-                return 0
             fi
         else
 		    echo -e " Leaving configuration but commenting out."
@@ -433,11 +431,9 @@ else
                 if curl --output /dev/null --silent --head -fail "$templateurl"; then
                     echo -e " $templateurl is a valid url.\n Continuing to use this template file"
                     pass
-                    return 0
                 else
 	                echo -e " We cannot get the LXD template image from $templateurl.\n Marking as failed"
 	                fail
-                    return 0
                 fi
             else
 		        echo -e " Leaving configuration but commenting out."
@@ -467,11 +463,9 @@ if grep "^LXD_ROOTFS =" /etc/xdg/canonical-certification.conf >/dev/null; then
             if curl --output /dev/null --silent --head -fail "$rootfsurl"; then
                 echo -e " $rootfsurl is a valid url.\n Continuing to use this rootfs file"
                 pass
-                return 0
             else
 	            echo -e " We cannot get the rootfs file from $rootfsurl.\n Marking as failed"
 	            fail
-                return 0
             fi
         else
 		    echo -e " Leaving configuration but commenting out."
@@ -501,11 +495,9 @@ else
                 if curl --output /dev/null --silent --head -fail "$rootfsurl"; then
                     echo -e " $rootfsurl is a valid url.\n Continuing to use this rootfs file"
                     pass
-                    return 0
                 else
 	                echo -e " We cannot get the rootfs image from $rootfsurl.\n Marking as failed"
 	                fail
-                    return 0
                 fi
             else
 		        echo -e " Leaving configuration but commenting out."