X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fcapture-instance-metadata.sh;h=172ed109952c2ee32c275a0277dd288daf6a178b;hb=refs%2Ftags%2Fv0.85.0;hp=cb0081fd84b7653f26746c984400babc285cc9f4;hpb=033c0923b0a2aada193cf24ea7ce8725413c9d7f;p=releng%2Fglobal-jjb.git

diff --git a/shell/capture-instance-metadata.sh b/shell/capture-instance-metadata.sh
index cb0081fd..172ed109 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 [ -z "${NOMAD_DC}" ]; then
+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