From 5453e22702fd83b0ceac816461f9426c1ef08b5c Mon Sep 17 00:00:00 2001 From: Kai Qiang Wu Date: Wed, 25 Nov 2015 23:25:17 -0600 Subject: [PATCH] Remove temp fix for new oslo.versionedobjects As new oslo.versionedobjects 1.0.0 release, we not need this work-around now. So remove it. Closes-Bug: #1518147 Change-Id: I7cba6de5ebbb655647a4c833d04c4930c9cd1fbc --- devstack/plugin.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index b3dcedc36c..da75f403e8 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -12,10 +12,6 @@ if is_service_enabled m-api m-cond; then if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then echo_summary "Before Installing magnum" mkdir -p $SCREEN_LOGDIR - # TODO: Temp fix for jenkins failure, remove it if newer oslo.versionedobjects release is ok - if [[ -n `grep 'oslo.versionedobjects' ${REQUIREMENTS_DIR}/upper-constraints.txt` ]]; then - sed -i 's/oslo.versionedobjects===.*/oslo.versionedobjects===0.12.0/g' ${REQUIREMENTS_DIR}/upper-constraints.txt - fi elif [[ "$1" == "stack" && "$2" == "install" ]]; then echo_summary "Installing magnum" install_magnum