From d4f5a7bb9ca26aa13d7b1cfafe8a1fba30b49679 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 12 Feb 2018 13:56:42 +1100
Subject: [PATCH] Fix legacy dsvm jobs
The legacy-dsvm-nodepool-*-src jobs use this script, but don't pass
the argument added by I203d149a1d63ac8358e1c8b878d9c2bc0ba67c02.
Default it while we migrate everything.
Change-Id: I30943a3242d80ab87f6a89ec7f2bcfd3d62ad64b
---
tools/check_devstack_plugin.sh | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/check_devstack_plugin.sh b/tools/check_devstack_plugin.sh
index 8b86fa2a0..b13c0040e 100755
--- a/tools/check_devstack_plugin.sh
+++ b/tools/check_devstack_plugin.sh
@@ -1,8 +1,14 @@
#!/bin/bash -ex
-LOGDIR=$1
+# NOTE(ianw): remove this and "/opt/stack/new" path when native only
+# jobs that pass this arg
+LOGDIR=${1:-$WORKSPACE/logs/}
-NODEPOOL_INSTALL=${NODEPOOL_INSTALL:-/opt/stack/nodepool-venv}
+if [[ -d /opt/stack/nodepool-venv ]]; then
+ NODEPOOL_INSTALL=${NODEPOOL_INSTALL:-/opt/stack/nodepool-venv}
+else
+ NODEPOOL_INSTALL=${NODEPOOL_INSTALL:-/opt/stack/new/nodepool-venv}
+fi
NODEPOOL_CONFIG=${NODEPOOL_CONFIG:-/etc/nodepool/nodepool.yaml}
NODEPOOL_SECURE=${NODEPOOL_SECURE:-/etc/nodepool/secure.conf}
NODEPOOL="$NODEPOOL_INSTALL/bin/nodepool -c $NODEPOOL_CONFIG -s $NODEPOOL_SECURE"