openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix BASEDIR to package Kolla with snapcraft.io"

Browse Source
This commit is contained in:
Jenkins 2017-02-08 18:30:09 +00:00 committed by Gerrit Code Review
commit d561c23496
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/kolla-ansible
View File

@ -5,12 +5,16 @@
function find_base_dir { function find_base_dir {
local real_path=$(python -c "import os;print(os.path.realpath('$0'))") local real_path=$(python -c "import os;print(os.path.realpath('$0'))")
local dir_name="$(dirname "$real_path")" local dir_name="$(dirname "$real_path")"
if [[ ${dir_name} == "/usr/bin" ]]; then if [ -z "$SNAP" ]; then
BASEDIR=/usr/share/kolla if [[ ${dir_name} == "/usr/bin" ]]; then
elif [[ ${dir_name} == "/usr/local/bin" ]]; then BASEDIR=/usr/share/kolla
BASEDIR=/usr/local/share/kolla elif [[ ${dir_name} == "/usr/local/bin" ]]; then
BASEDIR=/usr/local/share/kolla
else
BASEDIR="$(dirname ${dir_name})"
fi
else else
BASEDIR="$(dirname ${dir_name})" BASEDIR="$SNAP/share/kolla"
fi fi
} }