summaryrefslogtreecommitdiffstats
path: root/jjb/scripts/setup_executor_env.sh
diff options
context:
space:
mode:
authorDave Wallace <dwallacelf@gmail.com>2021-03-24 19:21:33 -0400
committerDave Wallace <dwallacelf@gmail.com>2021-03-24 19:25:10 -0400
commit50028767df228c92a84796a2ef269da0f058234f (patch)
treecd151405676156cce4e27fa2cda8a522a204d64e /jjb/scripts/setup_executor_env.sh
parent69205a0b2b67abf523a863bfc3925e1e7a7066bc (diff)
Remove temporary DNS fix.
- Use search domain in /etc/resolv.conf as hostname. Change-Id: Iaf156a2096a1b60f6222fa2d7f99101d72e2572c Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'jjb/scripts/setup_executor_env.sh')
-rwxr-xr-xjjb/scripts/setup_executor_env.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/jjb/scripts/setup_executor_env.sh b/jjb/scripts/setup_executor_env.sh
index 1cc922a0..f6b6480f 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"