Merge "Enable the Ubuntu cloud archive"

labs/config/openstack

@@ -1,8 +1,8 @@
 # This file contains OpenStack configuration data. It is used by both
 # host (osbash, Windows batch) and VM guest scripts.
 
-# one of: folsom, grizzly, havana, icehouse
-: ${OPENSTACK_RELEASE:=icehouse}
+# one of: icehouse, juno
+: ${OPENSTACK_RELEASE:=juno}
 
 # CirrOS image URL
 CIRROS_URL="http://download.cirros-cloud.net/0.3.3/cirros-0.3.3-x86_64-disk.img"

labs/scripts/ubuntu/apt_init.sh

@@ -50,6 +50,9 @@ function ubuntu_cloud_archive {
         -o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0"
 }
 
-if grep -qs DISTRIB_CODENAME=precise /etc/lsb-release; then
+# precise needs the cloud archive, and so does trusty for non-Icehouse releases
+if grep -qs DISTRIB_CODENAME=precise /etc/lsb-release ||
+        [ "$OPENSTACK_RELEASE" != "icehouse" ]; then
+    echo "Enabling the Ubuntu cloud archive."
     ubuntu_cloud_archive
 fi