summaryrefslogtreecommitdiffstats
path: root/bifrost
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-03-07 17:40:09 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-07 17:40:09 +0000
commitc4651cc986ac5277d95027df77bc42cc783f2777 (patch)
tree40634ed3f980bffc473a8923ea1ea62aa951532a /bifrost
parent92f89a5d2028675cf03d8b828da1fd7233f77115 (diff)
parent448c53c6780f3f51bcd3fad95dbacdc85334ce46 (diff)
Merge "Bump bifrost sha and set UPPER_CONSTRAINTS_FILE"
Diffstat (limited to 'bifrost')
-rwxr-xr-xbifrost/scripts/bifrost-provision.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/bifrost/scripts/bifrost-provision.sh b/bifrost/scripts/bifrost-provision.sh
index d641d506..e64277d6 100755
--- a/bifrost/scripts/bifrost-provision.sh
+++ b/bifrost/scripts/bifrost-provision.sh
@@ -28,6 +28,9 @@ BIFROST_IRONIC_INSPECTOR_CLIENT_VERSION=${BIFROST_IRONIC_INSPECTOR_CLIENT_VERSIO
BIFROST_IRONIC_CLIENT_VERSION=${BIFROST_IRONIC_CLIENT_VERSION:-master}
BIFROST_IRONIC_VERSION=${BIFROST_IRONIC_VERSION:-master}
+# set UPPER_CONSTRAINTS_FILE since it is needed in order to limit libvirt-python to 4.0.0
+export UPPER_CONSTRAINTS_FILE=https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt
+
# Ensure the right inventory files is used based on branch
CURRENT_BIFROST_BRANCH=$(git rev-parse --abbrev-ref HEAD)
if [ $CURRENT_BIFROST_BRANCH = "master" ]; then