Use new env vars for tripleo yaml build

When moving from legacy build to yaml based build,
the env vars needed changed. We need to stop using the
USE_DELOREAN_TRUNK and DELOREAN_TRUNK_REPO vars, and start
using DELOREAN_REPO_URL instead, to be consumed by
the delorean-repo element.

Change-Id: Ieea596195625f5e6fb902ae8403bfe705ebedeed
This commit is contained in:
Yolanda Robla 2017-06-06 22:44:38 +02:00
parent dc2d1ee6e2
commit 9c4089ced8
1 changed files with 3 additions and 4 deletions

View File

@ -53,14 +53,13 @@
# Basic Deployment (CLI)
# http://docs.openstack.org/developer/tripleo-docs/basic_deployment/basic_deployment_cli.html
export USE_DELOREAN_TRUNK=1
export DELOREAN_REPO_FILE="delorean.repo"
# set the correct build repo
case "$ZUUL_BRANCH" in
"stable/newton") export DELOREAN_TRUNK_REPO="https://trunk.rdoproject.org/centos7-newton/current/" ;;
"stable/ocata") export DELOREAN_TRUNK_REPO="https://trunk.rdoproject.org/centos7-ocata/current/" ;;
*) export DELOREAN_TRUNK_REPO="https://trunk.rdoproject.org/centos7-master/current-tripleo/" ;;
"stable/newton") export DELOREAN_REPO_URL="https://trunk.rdoproject.org/centos7-newton/current/" ;;
"stable/ocata") export DELOREAN_REPO_URL="https://trunk.rdoproject.org/centos7-ocata/current/" ;;
*) export DELOREAN_REPO_URL="https://trunk.rdoproject.org/centos7-master/current-tripleo/" ;;
esac
# if we are on master, install from source