openstack/bifrost
Code Issues Proposed changes

Merge "Fixing virtualenv issues"

Browse Source
This commit is contained in:
Jenkins 2016-03-03 06:07:19 +00:00 committed by Gerrit Code Review
commit 789987dcc8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/roles/bifrost-ironic-install/tasks/pip_install.yml
View File

@ -18,7 +18,7 @@
name: "{{ package }}" name: "{{ package }}"
state: "{{ state | default(omit) }}" state: "{{ state | default(omit) }}"
version: "{{ version | default(omit) }}" version: "{{ version | default(omit) }}"
virtualenv: "{{ bifrost_venv_dir if enable_venv else 'undefined' }}" virtualenv: "{{ bifrost_venv_dir if enable_venv else omit }}"
when: source_install is not defined or source_install == false when: source_install is not defined or source_install == false
# NOTE (cinerama): We should be able to use the pip module here and # NOTE (cinerama): We should be able to use the pip module here and
# possibly merge these two tasks when # possibly merge these two tasks when

2
scripts/env-setup.sh
View File

@ -30,11 +30,9 @@ if [ -x '/usr/bin/apt-get' ]; then
fi fi
if [ -n "${VENV-}" ]; then if [ -n "${VENV-}" ]; then
if ! $(virtualenv --version &>/dev/null); then if ! $(virtualenv --version &>/dev/null); then
if $(sudo -H apt-get -y install virtualenv); then
sudo -H apt-get -y install python-virtualenv sudo -H apt-get -y install python-virtualenv
fi fi
fi fi
fi
elif [ -x '/usr/bin/yum' ]; then elif [ -x '/usr/bin/yum' ]; then
if ! yum -q list installed python-devel; then if ! yum -q list installed python-devel; then
sudo -H yum -y install python-devel sudo -H yum -y install python-devel