openstack
/
project-config
Code Issues Proposed changes

Don't require NODEPOOL_SCRIPTDIR to be set 

If someone is building an image locally and don't want to do anything
special with nodepool scripts, they should not need to set an env var.
The env var obviously still needs to be honored for nodepool operation
and for override.

Change-Id: I08076a8eafe7019e715b1b46633e8f603031a1ea
This commit is contained in:
Monty Taylor 2015-05-10 12:40:26 -04:00
parent fa0da6e145
commit e60dc2a3c1
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
nodepool/elements/nodepool-base/extra-data.d/50-copy-nodepool-scripts → nodepool/elements/nodepool-base/extra-data.d/99-copy-nodepool-scripts
View File

@ -18,7 +18,22 @@
# Copy the nodepools scripts into the image
# This is 99 because it needs to depend on source-repositories having been
# run, because the default fallthrough location for the nodepool scripts
# is the git repo that's been cloned into the image.
# During a nodepool run, it's expected that NODEPOOL_SCRIPTDIR is set, in
# which case ordering doesn't matter - but for a developer hacking locally
# who is not hacking on those scripts, it's an imposition to make them
# set an env var.
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
NODEPOOL_SCRIPTDIR=${NODEPOOL_SCRIPTDIR:-$TMP_MOUNT_PATH/opt/git/openstack-infra/project-config/nodepool/scripts}
sudo cp -a $NODEPOOL_SCRIPTDIR $TMP_MOUNT_PATH/opt/nodepool-scripts
sudo chmod -R a+rx $TMP_MOUNT_PATH/opt/nodepool-scripts