Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Fix stevedore package conflict in devstack script
Browse files Browse the repository at this point in the history
When installing python-muranoclient during devstack setup,
the dependent package stevedore is upgraded to 1.4.0 and it
conflicts with versions specified in global-requirements
causing heat failure. This change removes the "-U" from
"pip install" to skip installing a package if it exists
(as in the case of stevedore=1.3.0).

Closes-Bug: #1450010
Change-Id: Ia0fe33d66f7012391d54e28a804eb7540de323d4
  • Loading branch information
Steven Tran committed Apr 29, 2015
1 parent 1e53657 commit 755d9fc
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion contrib/devstack/lib/congress
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ function configure_congress {
}

function _congress_setup_third_party_requirements {
sudo pip install -U -r $CONGRESS_DIR/thirdparty-requirements.txt
sudo pip install -r $CONGRESS_DIR/thirdparty-requirements.txt
}

function configure_congress_datasources {
Expand Down
2 changes: 1 addition & 1 deletion thirdparty-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This file contains a list of optional requirements that are not in the
# offical global-requirements.txt
python-cloudfoundryclient>=1.0.2
python-muranoclient
python-muranoclient>=0.5.6,<0.6.0

0 comments on commit 755d9fc

Please sign in to comment.