openstack/kolla-ansible
Code Issues Proposed changes

Merge "Support kolla-ansible installed in a virtualenv"

Browse Source
This commit is contained in:
Jenkins 2017-02-17 16:29:59 +00:00 committed by Gerrit Code Review
commit 156118738a
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/kolla-ansible
View File

@ -10,6 +10,8 @@ function find_base_dir {
BASEDIR=/usr/share/kolla-ansible BASEDIR=/usr/share/kolla-ansible
elif [[ ${dir_name} == "/usr/local/bin" ]]; then elif [[ ${dir_name} == "/usr/local/bin" ]]; then
BASEDIR=/usr/local/share/kolla-ansible BASEDIR=/usr/local/share/kolla-ansible
elif [[ -n ${VIRTUAL_ENV} ]] && [[ ${dir_name} == "${VIRTUAL_ENV}/bin" ]]; then
BASEDIR="${VIRTUAL_ENV}/share/kolla-ansible"
else else
BASEDIR="$(dirname ${dir_name})" BASEDIR="$(dirname ${dir_name})"
fi fi