From 2cf6e3ea9efad5fa4c7a2480a3725e3306e10d75 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Mon, 13 Apr 2015 14:04:26 -0400 Subject: [PATCH] Update to a later Delorean trunk Move our Delorean trunk pin forward so that we can consume the Horizon builds from Delorean. A new change[1] to glance_store seems to be enforcing missing options for glance store backends. Disable the glance swift backend since we weren't actually using it anyway to get around this issue. [1] http://git.openstack.org/cgit/openstack/glance_store/commit/?id=c23ad1cb521eb63616ec6f1a4906b89e539fe306 Change-Id: If05b354e45a788dc1f3d4923614834d5375b331d --- elements/puppet-stack-config/puppet-stack-config.yaml.template | 1 - scripts/instack-build-images | 2 +- scripts/instack-setup-host | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template index 50c6dba73..d05b4b176 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -50,7 +50,6 @@ glance::api::registry_host: {{LOCAL_IP}} glance::api::keystone_password: {{UNDERCLOUD_GLANCE_PASSWORD}} glance::api::known_stores: - glance.store.filesystem.Store - - glance.store.swift.Store glance::api::pipeline: 'keystone' # used to construct glance_api_servers glance_port: 9292 diff --git a/scripts/instack-build-images b/scripts/instack-build-images index 67089fc49..b1d87ea4d 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/48/3d/483de6313fab5913f9e68eb24afe65c36bd9b623_e37f6f1a/" +export DELOREAN_EL7_REPO_URL="http://trunk.rdoproject.org/centos70/2f/a5/2fa5839e2efc0f93c815aeff5ad0ddee1ba16830_d9a2ddd9" export NODE_DIST=${NODE_DIST:-""} diff --git a/scripts/instack-setup-host b/scripts/instack-setup-host index e116bd662..6ca53e639 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/48/3d/483de6313fab5913f9e68eb24afe65c36bd9b623_e37f6f1a/delorean.repo"} +export DELOREAN_REPO=${DELOREAN_REPO:-"http://trunk.rdoproject.org/centos70/2f/a5/2fa5839e2efc0f93c815aeff5ad0ddee1ba16830_d9a2ddd9/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