From 3c919f0f43babd56ad1031546c1bdb951f0c0fe6 Mon Sep 17 00:00:00 2001 From: Anil Belur Date: Thu, 21 Apr 2022 09:56:25 +1000 Subject: [PATCH] Revert "Fix: Remove "--python" flag from venv act" This reverts commit 18d90a9e0b74515b6aa2ac8fc4a17b9d98a7680e. The issue does not happen on C7/C8 but mostly on Ubuntu and needs to be addressed elsewhere. Change-Id: I54abbea2550ed6d80e3c7d75ab86d246c0ec98d2 Signed-off-by: Anil Belur --- releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml | 6 ------ shell/capture-instance-metadata.sh | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 100644 releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml diff --git a/releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml b/releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml deleted file mode 100644 index e5dca742..00000000 --- a/releasenotes/notes/fix-venv-call-79fd4ca9c570a7b4.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fixes: - - | - Remove "--python" flag from lf-activate-venv call in capture-instance-metadata. - This forces the system to use Python 2, which is not available on newer - systems, and is causing failures. diff --git a/shell/capture-instance-metadata.sh b/shell/capture-instance-metadata.sh index 57a4e8d1..0648d1dd 100644 --- a/shell/capture-instance-metadata.sh +++ b/shell/capture-instance-metadata.sh @@ -14,7 +14,7 @@ echo "---> capture-instance-metadata.sh" # shellcheck disable=SC1090 source ~/lf-env.sh -lf-activate-venv python3.8 lftools +lf-activate-venv --python python3.8 lftools # detect if we're in EC2 if [ -n "${NOMAD_DC}" ]; then -- 2.16.6