summaryrefslogtreecommitdiff
path: root/devstack
diff options
context:
space:
mode:
authorJens Harbott <j.harbott@x-ion.de>2018-04-24 09:25:29 +0000
committerJens Harbott <j.harbott@x-ion.de>2018-04-24 09:25:29 +0000
commit53b56e147a3a8dd0cfa14d99f204387507af9a5c (patch)
treeacf94c6dec1e2b33e380f85caa6024b8f4310a96 /devstack
parent430fff8313a364f951423768d9ee8fdba4e79a27 (diff)
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
Notes
Notes (review): Code-Review+1: Matt Riedemann <mriedem.os@gmail.com> Code-Review+1: melanie witt <melwittt@gmail.com> Code-Review+2: Jon Bernard <jobernar@redhat.com> Workflow+1: Jon Bernard <jobernar@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Tue, 24 Apr 2018 15:52:38 +0000 Reviewed-on: https://review.openstack.org/563870 Project: openstack/devstack-plugin-ceph Branch: refs/heads/master
Diffstat (limited to 'devstack')
-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"