Merge lp:~bladernr/maas-cert-server/1621986-mcs-mirror-cloud-images into lp:~hardware-certification/maas-cert-server/trunk

[Jeff Lane ]

Modifies maniacs-setup to download a mirror of cloud-images.ubuntu.com (it downloads ONLY the specified versions set up in GLOBALS and prompts the user for each one).

I've tested this on digital-ocean and it seems to work for both the case of a new server and a serve where we're re-running with -d.

[Rod Smith (rodsmith)]

I've got some suggestions for improvements to the procedure, and one minor prompting issue. If you don't want to tackle the bigger issue now, I can approve this with just the prompt issue fixed, and you or I can fix the bigger procedural issues later.

review: Needs Fixing

[lp:~bladernr/maas-cert-server/1621986-mcs-mirror-cloud-images]

66. By Jeff Lane  on 2016-09-13

fixed typo

[Jeff Lane  (bladernr)]

I fixed the missing 'take'. Lets go with that for now and I'll email the rest of the thoughts because I think they're a bit bigger than this MR>

review: Needs Resubmitting

[Rod Smith (rodsmith)]

OK, I'll approve it as-is and we can deal with the other issues later....

review: Approve

=== modified file 'usr/sbin/maniacs-setup'
--- usr/sbin/maniacs-setup	2016-08-22 13:20:59 +0000
+++ usr/sbin/maniacs-setup	2016-09-13 18:57:37 +0000
@@ -39,7 +39,7 @@
     UPDATE_PRESEEDS=0
     while [[ $# -gt 0 ]]; do
         case $1 in
-            --download-virtualization-image|-d)
+            --download-virtualization-images|-d)
                 DOWNLOAD_VIRTUALIZATION_IMAGE=1
                 DO_IT_ALL=0
                 ;;
@@ -59,7 +59,7 @@
                 UPDATE_POINT_RELEASES=1
                 DO_IT_ALL=0
                 ;;
-            *) echo "Usage: $0 [ --download-virtualization-image ]"
+            *) echo "Usage: $0 [ --download-virtualization-images ]"
                echo "                     [ --import-boot-resources ] [ --mirror-archives ]"
                echo "                     [ --update-point-releases ] [ --update-preseeds ]"
                DO_IT_ALL=0
@@ -140,7 +140,8 @@
     MIRROR_LIST="/etc/apt/mirror.list"
     # Below is URL given to nodes; it's also verified by the user later.
     DEFAULT_REPO_URL=$MIRROR_FROM_ARCHIVE
-    CLOUD_IMAGE="trusty-server-cloudimg-i386-disk1.img"
+    CLOUD_RELEASES="trusty xenial yakkety"
+    CLOUD_MIRROR="/srv/cloud"
     RETRY=10
     MIRRORED=0
 
@@ -512,27 +513,47 @@
 retrieve_virtualization_image() {
     echo
     echo "***************************************************************************"
-    echo "* An Ubuntu cloud image is required for virtualization tests. Having such an"
-    echo "* image on your MAAS server can be convenient, but downloading it can take"
-    echo "* a while (it's about 250MiB)."
-    echo "*"
-    if [ -f /srv/$CLOUD_IMAGE ] ; then
-        echo "*  A cloud image file already exists at /srv/$CLOUD_IMAGE;"
-        echo "*  skipping download."
+    echo "* An Ubuntu cloud image is required for virtualization tests. Having such"
+    echo "* an image on your MAAS server can be convenient, but downloading it can"
+    echo "* take a while (each image is about 250MiB). This process will import cloud"
+    echo "* images for each supported architecture for the selected release"
+    echo "*"
+    if [ -d $CLOUD_MIRROR ] ; then
+        echo "*  A mirror of cloud images seems to already exists at /srv/cloud;"
+        get_yn "*  Do you wish to continue?" "N"
+        if [ $YN = "N" ]; then
+            echo "Skipping."
+            return
+        fi
+    fi
+    echo "* To defer this task, respond 'N' to the following question."
+    echo "*"
+    get_yn "* Do you want to set up a local cloud image mirror for the virtualization tests" "Y"
+    if [ $YN = "Y" ] ; then
+        if [ ! -d $CLOUD_MIRROR ] ; then
+            echo "* Cloud Mirror does not exist.  Creating."
+            mkdir -p $CLOUD_MIRROR
+            ln -sf $CLOUD_MIRROR /var/www/html
+        fi
+        for release in $CLOUD_RELEASES; do
+            get_yn "* Do you want to get images for $release?" "Y"
+            if [ $YN = "Y" ]; then
+                get_these="$get_these $release"
+            fi
+        done
+        echo "* Downloading cloud images.  This may take some time."
+        for release in $get_these; do
+            wget --mirror -r -nH --adjust-extension --no-parent -P $CLOUD_MIRROR \
+                 --convert-links http://cloud-images.ubuntu.com/$release/current/
+        done 
+        echo "*"
+        echo "* Virtualization image mirror is stored as $CLOUD_MIRROR"
+        echo "* and is available at http://$INTERNAL_IP/cloud/"
     else
-        echo "* To defer this task, respond 'N' to the following question."
-        echo "*"
-        get_yn "* Do you want to copy a cloud image for the virtualization tests" "Y"
-        if [ $YN = "Y" ] ; then
-            wget -P /srv http://cloud-images.ubuntu.com/trusty/current/$CLOUD_IMAGE
-            echo "*"
-            echo "* Virtualization image is stored as /srv/$CLOUD_IMAGE"
-        else
-            echo "*"
-            echo "* You can download a virtualization image later by running this script with"
-            echo "* the --download-virtualization-image (or -d) option."
-            echo "*"
-        fi
+        echo "*"
+        echo "* You can download virtualization images later by running this script with"
+        echo "* the --download-virtualization-images (or -d) option."
+        echo "*"
     fi
 }
 
@@ -1003,8 +1024,8 @@
     echo "* You can set up a local mirror later by running this script with the"
     echo "* --mirror-archives (or -m) option."
     echo "*"
-    echo "* You can download a virtualization image later by running this script with"
-    echo "* the --download-virtualization-image (or -d) option."
+    echo "* You can download virtualization images later by running this script with"
+    echo "* the --download-virtualization-images (or -d) option."
     echo "*"
     echo "* You can import boot resources via the MAAS web UI or by re-running this"
     echo "* script with the --import-boot-resources (or -i) option."