From 0ec23626d418f54c45f6668895ccd6e7aa3c6063 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Wed, 1 Apr 2015 15:37:53 -0400 Subject: [PATCH] Update to a later Delorean repo. This is needed to get a newer neutron that we now need since we are no longer using the midstream neutron fork. Change-Id: Ia28fcebc26e4238bc2aa57e9e99964863cc549ce --- scripts/instack-build-images | 2 +- scripts/instack-setup-host | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/instack-build-images b/scripts/instack-build-images index 5caa22fdf..f0cc5f824 100755 --- a/scripts/instack-build-images +++ b/scripts/instack-build-images @@ -35,7 +35,7 @@ export NODE_ARCH=${NODE_ARCH:-amd64} # We must do this until tripleo-puppet-elements is packaged 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:-""} diff --git a/scripts/instack-setup-host b/scripts/instack-setup-host index dedcfaa0a..c1470a565 100755 --- a/scripts/instack-setup-host +++ b/scripts/instack-setup-host @@ -6,7 +6,7 @@ set -o pipefail # Install repo file for Delorean master packages # Pin to an older repo for now because newer openstack-keystone requires a # 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 # 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