From c52dc5db887dc193556dc0554a5bf0c01352071e Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Tue, 20 Sep 2016 10:06:27 +0000 Subject: [PATCH] Add stable release to image elements When creating overcloud images the deps repo is all the time centos7/delorean-deps.repo without taking into account that when using stable releases needs to be changed to: centos7-liberty/delorean-deps.repo centos7-mitaka/delorean-deps.repo Change-Id: I8d5e52809b339bc156eb173dca6b3d2436ad0c87 Closes-bug: #1625463 Closes-bug: #1625315 --- elements/delorean-repo/pre-install.d/01-delorean-repo | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/elements/delorean-repo/pre-install.d/01-delorean-repo b/elements/delorean-repo/pre-install.d/01-delorean-repo index ea82f5364..c91a7ea70 100755 --- a/elements/delorean-repo/pre-install.d/01-delorean-repo +++ b/elements/delorean-repo/pre-install.d/01-delorean-repo @@ -6,9 +6,15 @@ export DELOREAN_REPO_FILE=${DELOREAN_REPO_FILE:-"delorean.repo"} # delorean requires delorean-deps if [[ "rhel7 centos7" =~ "$DISTRO_NAME" ]]; then + + if [ -z "$STABLE_RELEASE" ]; then curl http://trunk.rdoproject.org/centos7/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo + else + curl http://trunk.rdoproject.org/centos7-$STABLE_RELEASE/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo + fi + elif [[ "fedora" =~ "$DISTRO_NAME" ]]; then - curl http://trunk.rdoproject.org/f$DIB_RELEASE/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo + curl http://trunk.rdoproject.org/f$DIB_RELEASE/delorean-deps.repo -o /etc/yum.repos.d/delorean-deps.repo fi if [ -n "$DELOREAN_REPO_URL" ]; then