Merge "Update to a later Delorean trunk"
This commit is contained in:
commit
9668ff0e20
@ -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
|
||||
|
@ -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:-""}
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user