Commit feff93d0 authored by David Johnson's avatar David Johnson

Switch default VM image from trusty to xenial.

parent 5a52f759
......@@ -29,14 +29,14 @@ fi
cd $IMAGEDIR
imgfile=`get_url "http://boss.utah.cloudlab.us/downloads/openstack/trusty-server-cloudimg-arm64-disk1.img https://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-arm64-disk1.img"`
imgname=trusty-server
imgfile=`get_url "http://boss.utah.cloudlab.us/downloads/openstack/xenial-server-cloudimg-arm64-disk1.img https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-disk1.img"`
imgname=xenial-server
if [ ! $? -eq 0 ]; then
echo "ERROR: failed to download trusty-server-cloudimg-arm64-disk1.img from Cloudlab or Ubuntu!"
echo "ERROR: failed to download xenial-server-cloudimg-arm64-disk1.img from Cloudlab or Ubuntu!"
else
imgfile=`extract_image "$imgfile"`
if [ ! $? -eq 0 ]; then
echo "ERROR: failed to extract trusty-server-cloudimg-arm64-disk1.img"
echo "ERROR: failed to extract xenial-server-cloudimg-arm64-disk1.img"
else
(fixup_image "$imgfile" \
&& sched_image "$IMAGEDIR/$imgfile" "$imgname" ) \
......
......@@ -29,13 +29,13 @@ fi
cd $IMAGEDIR
echo "*** Configuring a trusty-server x86_64 image ..."
imgfile=trusty-server-cloudimg-amd64-disk1.img
imgname=trusty-server
echo "*** Configuring a xenial-server x86_64 image ..."
imgfile=xenial-server-cloudimg-amd64-disk1.img
imgname=xenial-server
#
# First try the local boss, then Apt, then just grab from Ubuntu.
#
imgfile=`get_url "http://boss.${OURDOMAIN}/downloads/openstack/$imgfile http://boss.apt.emulab.net/downloads/openstack/$imgfile https://cloud-images.ubuntu.com/trusty/current/$imgfile"`
imgfile=`get_url "http://boss.${OURDOMAIN}/downloads/openstack/$imgfile http://boss.apt.emulab.net/downloads/openstack/$imgfile https://cloud-images.ubuntu.com/xenial/current/$imgfile"`
if [ ! $? -eq 0 ]; then
echo "ERROR: failed to download $imgfile from Cloudlab or Ubuntu!"
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment