diff options
| -rwxr-xr-x | jjb/scripts/backup_upload_archives.sh | 3 | ||||
| -rwxr-xr-x | jjb/scripts/setup_executor_env.sh | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/jjb/scripts/backup_upload_archives.sh b/jjb/scripts/backup_upload_archives.sh index 1a9c577e1..0599c9676 100755 --- a/jjb/scripts/backup_upload_archives.sh +++ b/jjb/scripts/backup_upload_archives.sh @@ -23,9 +23,6 @@ if [ -f "$PYTHON_SCRIPT" ]; then exit 0 fi -# TEMPORARY: talk to consul-aware resolver rather than external ones -echo "nameserver 172.17.0.1" >/etc/resolv.conf - # the Python code below needs boto3 installed python3 -m pip install boto3 mkdir -p $(dirname "$PYTHON_SCRIPT") diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh index 1cc922a01..f6b6480f4 100755 --- a/jjb/scripts/setup_executor_env.sh +++ b/jjb/scripts/setup_executor_env.sh @@ -29,7 +29,7 @@ echo "$long_line" echo "Executor OS: $OS_ID-$OS_VERSION_ID" echo "Executor Arch: $OS_ARCH" # TODO: fix this to print nomad server hostname -echo "Executor hostname: $(hostname)" +echo "Executor hostname: $(grep search /etc/resolv.conf | cut -d' ' -f2 | head -1)" echo "$long_line" if [ -f "$dockerfile" ] ; then @@ -55,10 +55,8 @@ pip3 list 2>/dev/null | column -t || true echo "$long_line" echo "Executor Downloads cache '$downloads_cache':" ls -lh "$downloads_cache" || true -echo "$long_line" -# TEMPORARY: talk to consul-aware resolver rather than external ones -echo "nameserver 172.17.0.1" >/etc/resolv.conf +echo "$long_line" echo "DNS nameserver config in '/etc/resolv.conf':" cat /etc/resolv.conf || true echo "$long_line" |