openstack
/
training-labs
Code Issues Proposed changes

OpenStack Train update 

This changeset contains updates for the OpenStack Train release.

Change-Id: Ie72c84b92014c7c99e96549e17b971eb418808ef
This commit is contained in:
Roger Luethi 2019-11-21 07:02:04 +01:00
parent b2dea05292
commit f06d146a55
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
labs/osbash/config/openstack
View File

@ -1,10 +1,10 @@
# This file contains OpenStack configuration data. It is used by both
# host (osbash, Windows batch) and VM guest scripts.
# stein (production release; cloud-archive:stein)
# stein-proposed (pre-release testing: cloud-archive:stein-proposed)
# stein-staging (ppa:openstack-ubuntu-testing/stein)
: ${OPENSTACK_RELEASE:=stein}
# train (production release; cloud-archive:train)
# train-proposed (pre-release testing: cloud-archive:train-proposed)
# train-staging (ppa:openstack-ubuntu-testing/train)
: ${OPENSTACK_RELEASE:=train}
# CirrOS image URL
if [ "$(uname -m)" = "x86_64" ]; then

20
labs/osbash/scripts/ubuntu/apt_init.sh
View File

@ -47,24 +47,24 @@ sudo apt update
# https://docs.openstack.org/install-guide/environment-packages-ubuntu.html
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# NOTE: Using pre-release staging ppa is not documented in install-guide
# https://launchpad.net/~ubuntu-cloud-archive/+archive/ubuntu/stein-staging
# https://launchpad.net/~ubuntu-cloud-archive/+archive/ubuntu/train-staging
#--------------------------------------------------------------------------
echo "Installing packages needed for add-apt-repository."
sudo apt -y install software-properties-common
case "$OPENSTACK_RELEASE" in
stein)
REPO=cloud-archive:stein
SRC_FILE=cloudarchive-stein.list
train)
REPO=cloud-archive:train
SRC_FILE=cloudarchive-train.list
;;
stein-proposed)
REPO=cloud-archive:stein-proposed
SRC_FILE=cloudarchive-stein-proposed.list
train-proposed)
REPO=cloud-archive:train-proposed
SRC_FILE=cloudarchive-train-proposed.list
;;
stein-staging)
REPO=ppa:ubuntu-cloud-archive/stein-staging
SRC_FILE=ubuntu-cloud-archive-ubuntu-stein-staging-bionic.list
train-staging)
REPO=ppa:ubuntu-cloud-archive/train-staging
SRC_FILE=ubuntu-cloud-archive-ubuntu-train-staging-bionic.list
;;
*)
echo >&2 "Unknown OpenStack release: $OPENSTACK_RELEASE. Aborting."