From 53b56e147a3a8dd0cfa14d99f204387507af9a5c Mon Sep 17 00:00:00 2001 From: Jens Harbott Date: Tue, 24 Apr 2018 09:25:29 +0000 Subject: [PATCH] Apply workaround for PasteDeploy only on stable/queens The workaround in order to fix the issue with Paste/PasteDeploy being pulled in as system packages when installing ceph is only needed for the Pike UCA. Assume that we only use that when devstack is running at the stable/queens branch. Change-Id: I0bbf04be015b777b3feb2c5e837b1f46f81cf3e9 --- devstack/plugin.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 838e306..3269721 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -32,14 +32,16 @@ elif [[ "$1" == "stack" && "$2" == "pre-install" ]]; then fi elif [[ "$1" == "stack" && "$2" == "install" ]]; then # FIXME(melwitt): This is a hack to get around a namespacing issue with - # Paste and PasteDeploy. Recently, we updated to use the Pike UCA packages + # Paste and PasteDeploy. For stable/queens, we use the Pike UCA packages # and the Ceph packages in the Pike UCA are pulling in python-paste and # python-pastedeploy packages. The python-pastedeploy package satisfies the # upper-constraints but python-paste does not, so devstack pip installs a # 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." - pip_install -U --force PasteDeploy + if [[ "$TARGET_BRANCH" == stable/queens ]]; then + pip_install -U --force PasteDeploy + fi elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then if is_ceph_enabled_for_service glance; then echo_summary "Configuring Glance for Ceph"