summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--devstack/plugin.sh6
1 files 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
32 fi 32 fi
33elif [[ "$1" == "stack" && "$2" == "install" ]]; then 33elif [[ "$1" == "stack" && "$2" == "install" ]]; then
34 # FIXME(melwitt): This is a hack to get around a namespacing issue with 34 # FIXME(melwitt): This is a hack to get around a namespacing issue with
35 # Paste and PasteDeploy. Recently, we updated to use the Pike UCA packages 35 # Paste and PasteDeploy. For stable/queens, we use the Pike UCA packages
36 # and the Ceph packages in the Pike UCA are pulling in python-paste and 36 # and the Ceph packages in the Pike UCA are pulling in python-paste and
37 # python-pastedeploy packages. The python-pastedeploy package satisfies the 37 # python-pastedeploy packages. The python-pastedeploy package satisfies the
38 # upper-constraints but python-paste does not, so devstack pip installs a 38 # upper-constraints but python-paste does not, so devstack pip installs a
39 # newer version of it, while python-pastedeploy remains. The mismatch 39 # newer version of it, while python-pastedeploy remains. The mismatch
40 # between the install path of paste and paste.deploy causes Keystone to 40 # between the install path of paste and paste.deploy causes Keystone to
41 # fail to start, with "ImportError: cannot import name deploy." 41 # fail to start, with "ImportError: cannot import name deploy."
42 pip_install -U --force PasteDeploy 42 if [[ "$TARGET_BRANCH" == stable/queens ]]; then
43 pip_install -U --force PasteDeploy
44 fi
43elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then 45elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
44 if is_ceph_enabled_for_service glance; then 46 if is_ceph_enabled_for_service glance; then
45 echo_summary "Configuring Glance for Ceph" 47 echo_summary "Configuring Glance for Ceph"