Browse Source

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
Jens Harbott 1 year ago
parent
commit
53b56e147a
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      devstack/plugin.sh

+ 4
- 2
devstack/plugin.sh View File

@@ -32,14 +32,16 @@ elif [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
32 32
     fi
33 33
 elif [[ "$1" == "stack" && "$2" == "install" ]]; then
34 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 36
     # and the Ceph packages in the Pike UCA are pulling in python-paste and
37 37
     # python-pastedeploy packages. The python-pastedeploy package satisfies the
38 38
     # upper-constraints but python-paste does not, so devstack pip installs a
39 39
     # newer version of it, while python-pastedeploy remains. The mismatch
40 40
     # between the install path of paste and paste.deploy causes Keystone to
41 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
43 45
 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
44 46
     if is_ceph_enabled_for_service glance; then
45 47
         echo_summary "Configuring Glance for Ceph"

Loading…
Cancel
Save