zuul/nodepool
Code Issues Proposed changes

Fix legacy dsvm jobs

Browse Source 
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
This commit is contained in:
Ian Wienand 2018-02-12 13:56:42 +11:00
parent 3bf920e9dd
commit d4f5a7bb9c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/check_devstack_plugin.sh
View File

@ -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"