openstack/instack-undercloud
Code Issues Proposed changes

Merge "Update to a later Delorean repo."

Browse Source
This commit is contained in:
Ben Nemec 2015-04-09 22:16:49 +02:00 committed by Gerrit Code Review
commit 39e0d65911
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/instack-build-images
View File

@ -35,7 +35,7 @@ export NODE_ARCH=${NODE_ARCH:-amd64}
# We must do this until tripleo-puppet-elements is packaged # We must do this until tripleo-puppet-elements is packaged
export DIB_INSTALLTYPE_puppet_modules=source export DIB_INSTALLTYPE_puppet_modules=source
export DELOREAN_EL7_REPO_URL="http://trunk.rdoproject.org/centos70/77/67/77671d5de0e40da08f31b91823dc93a0c1d39c31_1b51cbaf/" export DELOREAN_EL7_REPO_URL="http://trunk.rdoproject.org/centos70/48/3d/483de6313fab5913f9e68eb24afe65c36bd9b623_e37f6f1a/"
export NODE_DIST=${NODE_DIST:-""} export NODE_DIST=${NODE_DIST:-""}

2
scripts/instack-setup-host
View File

@ -6,7 +6,7 @@ set -o pipefail
# Install repo file for Delorean master packages # Install repo file for Delorean master packages
# Pin to an older repo for now because newer openstack-keystone requires a # Pin to an older repo for now because newer openstack-keystone requires a
# newer and not yet avaialable python-pycadf. # newer and not yet avaialable python-pycadf.
export DELOREAN_REPO=${DELOREAN_REPO:-"http://trunk.rdoproject.org/centos70/77/67/77671d5de0e40da08f31b91823dc93a0c1d39c31_1b51cbaf/delorean.repo"} export DELOREAN_REPO=${DELOREAN_REPO:-"http://trunk.rdoproject.org/centos70/48/3d/483de6313fab5913f9e68eb24afe65c36bd9b623_e37f6f1a/delorean.repo"}
sudo curl -o /etc/yum.repos.d/delorean.repo $DELOREAN_REPO sudo curl -o /etc/yum.repos.d/delorean.repo $DELOREAN_REPO
# We need to have the main delorean repo have a lower priority than ours to ensure our changes get installed # We need to have the main delorean repo have a lower priority than ours to ensure our changes get installed
sudo sed -i 's/priority=1/priority=10/' /etc/yum.repos.d/delorean.repo sudo sed -i 's/priority=1/priority=10/' /etc/yum.repos.d/delorean.repo