Merge "Fix BASEDIR because of new kolla-ansible project name"

This commit is contained in:
Jenkins
2017-02-16 15:13:14 +00:00
committed by Gerrit Code Review

View File

@@ -7,14 +7,14 @@ function find_base_dir {
local dir_name="$(dirname "$real_path")" local dir_name="$(dirname "$real_path")"
if [ -z "$SNAP" ]; then if [ -z "$SNAP" ]; then
if [[ ${dir_name} == "/usr/bin" ]]; then if [[ ${dir_name} == "/usr/bin" ]]; then
BASEDIR=/usr/share/kolla BASEDIR=/usr/share/kolla-ansible
elif [[ ${dir_name} == "/usr/local/bin" ]]; then elif [[ ${dir_name} == "/usr/local/bin" ]]; then
BASEDIR=/usr/local/share/kolla BASEDIR=/usr/local/share/kolla-ansible
else else
BASEDIR="$(dirname ${dir_name})" BASEDIR="$(dirname ${dir_name})"
fi fi
else else
BASEDIR="$SNAP/share/kolla" BASEDIR="$SNAP/share/kolla-ansible"
fi fi
} }