X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcapture-instance-metadata.sh;h=a5e0051c2ecf8dd8e598848a449733fe16c88b61;hb=4867c0799530acf13f7527c6a026879bdfb34e06;hp=23a9f2bf74c42e14a7f7a01b4be8acf4e67cf671;hpb=50b6737cb8b73ea2311b2992e7dfd6611f60b07c;p=releng%2Fglobal-jjb.git

diff --git a/shell/capture-instance-metadata.sh b/shell/capture-instance-metadata.sh
index 23a9f2bf..a5e0051c 100644
--- a/shell/capture-instance-metadata.sh
+++ b/shell/capture-instance-metadata.sh
@@ -11,14 +11,31 @@
 
 echo "---> capture-instance-metadata.sh"
 
+# shellcheck disable=SC1090
+source ~/lf-env.sh
+
+if [[ "${PYTHON:-}" -ne "" ]]; then
+    lf-activate-venv --python "$PYTHON" lftools
+elif python3; then
+    lf-activate-venv --python python3 lftools
+else
+    lf-activate-venv lftools
+fi
+
 # detect if we're in EC2
 if [ -n "${NOMAD_DC}" ]; then
     echo "INFO: Running in Nomad, no metadata"
     exit 0
 fi
 
-# detect if we're in AWS
-if grep -qi amazon /sys/devices/virtual/dmi/id/bios_vendor ; then
+if [[ ! -f /run/cloud-init/result.json ]]; then
+    echo "INFO: Running in unsupported cloud, no metadata"
+    exit 0
+fi
+
+# AWS not supported, exit
+cloudtype="$(jq -r .v1.datasource /run/cloud-init/result.json)"
+if [[ $cloudtype == "DataSourceEc2Local" ]]; then
     echo "INFO: Running in AWS, not capturing instance metadata"
     exit 0
 fi