Skip to content

Commit ded3c04

Browse files
markgoddardmmalchuk
authored andcommitted
kayobe-env: Unstick KOLLA_SOURCE_PATH and KOLLA_VENV_PATH
The kayobe-env script does not update the KOLLA_SOURCE_PATH and KOLLA_VENV_PATH variables if they are already set. This can lead to dangerous and difficult to diagnose issues where Kayobe uses a different version of Kolla Ansible than expected. This change updates these variables each time the kayobe-env script is sourced. Change-Id: I3b4b0b611750b9c7846ff5f74554aee2f14939e4 Closes-Bug: #2036711 (cherry picked from commit 651b8be)
1 parent 1e9eeb0 commit ded3c04

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kayobe-env

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ export KOLLA_CONFIG_PATH=$KAYOBE_CONFIG_ROOT/etc/kolla
3030
# kayobe/
3131
# kolla-ansible/
3232
base_path=$(realpath $KAYOBE_CONFIG_ROOT/../../)
33-
export KOLLA_SOURCE_PATH=${KOLLA_SOURCE_PATH:-${base_path}/src/kolla-ansible}
34-
export KOLLA_VENV_PATH=${KOLLA_VENV_PATH:-${base_path}/venvs/kolla-ansible}
33+
export KOLLA_SOURCE_PATH=${base_path}/src/kolla-ansible
34+
export KOLLA_VENV_PATH=${base_path}/venvs/kolla-ansible
3535

3636
function check_and_export_env {
3737
# Look for existing Kayobe environments

0 commit comments

Comments
 (0)