Apply workaround for PasteDeploy only on stable/queens

Code Issues Proposed changes

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

This commit is contained in:

Jens Harbott

2018年04月24日 09:25:29 +00:00

parent 430fff8313

commit 53b56e147a

1 changed files with 4 additions and 2 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/plugin.sh

View File

@@ -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"

Apply workaround for PasteDeploy only on stable/queens

6 devstack/plugin.sh Unescape Escape View File

6
devstack/plugin.sh

View File