openstack/bifrost
Code Issues Proposed changes

Fixing virtualenv issues

Browse Source 
A couple of issues relating to virtualenv arose while
testing on Ubuntu 15.10. Adjust the virtualenv setting
in the pip install phase to work correctly and simplify
the check and install of virtualenv so we get the right
package.

Change-Id: I09fb604ec6667aa45c3c2063adf3d760114aa65a
This commit is contained in:
stephane 2016-02-23 13:46:10 -08:00
parent d9c93c669c
commit 11a1944cfd
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 }}"
state: "{{ state | 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
# NOTE (cinerama): We should be able to use the pip module here and
# possibly merge these two tasks when

4
scripts/env-setup.sh
View File

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