openstack
/
training-labs
Code Issues Proposed changes

Merge "[1/7] OpenStack Stein update"

This commit is contained in:
Zuul 2019-06-21 02:55:06 +00:00 committed by Gerrit Code Review
parent 0ae5f99286 e81d3cfe9a
commit 1a7a166d23
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.
# rocky (production release; cloud-archive:rocky)
# rocky-proposed (pre-release testing: cloud-archive:rocky-proposed)
# rocky-staging (ppa:openstack-ubuntu-testing/rocky)
: ${OPENSTACK_RELEASE:=rocky}
# 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}
# 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/rocky-staging
# https://launchpad.net/~ubuntu-cloud-archive/+archive/ubuntu/stein-staging
#--------------------------------------------------------------------------
echo "Installing packages needed for add-apt-repository."
sudo apt -y install software-properties-common
case "$OPENSTACK_RELEASE" in
rocky)
REPO=cloud-archive:rocky
SRC_FILE=cloudarchive-rocky.list
stein)
REPO=cloud-archive:stein
SRC_FILE=cloudarchive-stein.list
;;
rocky-proposed)
REPO=cloud-archive:rocky-proposed
SRC_FILE=cloudarchive-rocky-proposed.list
stein-proposed)
REPO=cloud-archive:stein-proposed
SRC_FILE=cloudarchive-stein-proposed.list
;;
rocky-staging)
REPO=ppa:ubuntu-cloud-archive/rocky-staging
SRC_FILE=ubuntu-cloud-archive-ubuntu-rocky-staging-bionic.list
stein-staging)
REPO=ppa:ubuntu-cloud-archive/stein-staging
SRC_FILE=ubuntu-cloud-archive-ubuntu-stein-staging-bionic.list
;;
*)
echo >&2 "Unknown OpenStack release: $OPENSTACK_RELEASE. Aborting."