From 39de6df04130cf2f221fb5ba2a9b5ff597de332a Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Wed, 14 Nov 2018 15:23:04 +0000 Subject: [PATCH] Fix installation of PasteDeploy from upstream pkgs (again) Similar to what happened some time ago for the stable/queens branch, we are now seeing issues again on master after there was a new Paste release being made a couple of weeks ago. So we need to perform the same workaround of forcing pip to install PasteDeploy over the distro version on the master branch. Change-Id: I3e98a08e78182bdf5ec09b30e31b98435ec29456 Closes-Bug: 1803143 --- devstack/plugin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 3269721..d779b5e 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -39,7 +39,7 @@ elif [[ "$1" == "stack" && "$2" == "install" ]]; then # newer version of it, while python-pastedeploy remains. The mismatch # between the install path of paste and paste.deploy causes Keystone to # fail to start, with "ImportError: cannot import name deploy." - if [[ "$TARGET_BRANCH" == stable/queens ]]; then + if [[ "$TARGET_BRANCH" == stable/queens || "$TARGET_BRANCH" == master ]]; then pip_install -U --force PasteDeploy fi elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then