From 651b8be1a0a2dd38ab46253a0c4a9c7d617cf7bc Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Wed, 20 Sep 2023 09:14:17 +0100
Subject: [PATCH] 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
---
 kayobe-env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kayobe-env b/kayobe-env
index 5137927..28b1ccc 100644
--- a/kayobe-env
+++ b/kayobe-env
@@ -30,8 +30,8 @@ export KOLLA_CONFIG_PATH=$KAYOBE_CONFIG_ROOT/etc/kolla
 #     kayobe/
 #     kolla-ansible/
 base_path=$(realpath $KAYOBE_CONFIG_ROOT/../../)
-export KOLLA_SOURCE_PATH=${KOLLA_SOURCE_PATH:-${base_path}/src/kolla-ansible}
-export KOLLA_VENV_PATH=${KOLLA_VENV_PATH:-${base_path}/venvs/kolla-ansible}
+export KOLLA_SOURCE_PATH=${base_path}/src/kolla-ansible
+export KOLLA_VENV_PATH=${base_path}/venvs/kolla-ansible
 
 function check_and_export_env {
   # Look for existing Kayobe environments