openstack/kolla-ansible
Code Issues Proposed changes

Fix BASEDIR to package Kolla with snapcraft.io

Browse Source 
Change-Id: Ifc2af94e30183c86166ec2946d107becd53fd82f
This commit is contained in:
Saverio Proto 2017-01-30 11:30:35 +01:00
parent 0d16ad7343
commit 882c31231d
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/kolla-ansible
View File

@ -5,6 +5,7 @@
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 [ -z "$SNAP" ]; then
if [[ ${dir_name} == "/usr/bin" ]]; then if [[ ${dir_name} == "/usr/bin" ]]; then
BASEDIR=/usr/share/kolla BASEDIR=/usr/share/kolla
elif [[ ${dir_name} == "/usr/local/bin" ]]; then elif [[ ${dir_name} == "/usr/local/bin" ]]; then
@ -12,6 +13,9 @@ function find_base_dir {
else else
BASEDIR="$(dirname ${dir_name})" BASEDIR="$(dirname ${dir_name})"
fi fi
else
BASEDIR="$SNAP/share/kolla"
fi
} }
function process_cmd { function process_cmd {