openstack/aodh
Code Issues Proposed changes

Merge "Simple pip install fails under python3"

Browse Source
This commit is contained in:
Jenkins 2017-01-05 19:30:22 +00:00 committed by Gerrit Code Review
commit 50982ad11e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/plugin.sh
View File

@ -247,7 +247,12 @@ function init_aodh {
function install_aodh {
_aodh_prepare_coordination
install_aodhclient
sudo -H pip install -e "$AODH_DIR"[test,$AODH_BACKEND]
if python3_enabled; then
PIP=$(which pip 2>/dev/null || which pip-python 2>/dev/null)
sudo -H python${PYTHON3_VERSION} $PIP install -e "$AODH_DIR"[test,$AODH_BACKEND]
else
sudo -H pip install -e "$AODH_DIR"[test,$AODH_BACKEND]
fi
sudo install -d -o $STACK_USER -m 755 $AODH_CONF_DIR
if [ "$AODH_DEPLOY" == "mod_wsgi" ]; then