openstack/training-guides
Code Issues Proposed changes

Merge "Enable the Ubuntu cloud archive"

Browse Source
This commit is contained in:
Jenkins 2015-02-19 20:30:11 +00:00 committed by Gerrit Code Review
commit e8d0b05172
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
labs/config/openstack
View File

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

5
labs/scripts/ubuntu/apt_init.sh
View File

@ -50,6 +50,9 @@ function ubuntu_cloud_archive {
-o Dir::Etc::sourceparts="-" -o APT::Get::List-Cleanup="0" -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 ubuntu_cloud_archive
fi fi