aboutsummaryrefslogtreecommitdiff
path: root/bin/start-slave.sh
diff options
context:
space:
mode:
Diffstat (limited to 'bin/start-slave.sh')
-rwxr-xr-xbin/start-slave.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/start-slave.sh b/bin/start-slave.sh
index 616c76e4ee..26b5b9d462 100755
--- a/bin/start-slave.sh
+++ b/bin/start-slave.sh
@@ -6,7 +6,8 @@ bin=`cd "$bin"; pwd`
# Set SPARK_PUBLIC_DNS so slaves can be linked in master web UI
if [ "$SPARK_PUBLIC_DNS" = "" ]; then
# If we appear to be running on EC2, use the public address by default:
- if [[ `hostname` == *ec2.internal ]]; then
+ # NOTE: ec2-metadata is installed on Amazon Linux AMI. Check based on that and hostname
+ if command -v ec2-metadata > /dev/null || [[ `hostname` == *ec2.internal ]]; then
export SPARK_PUBLIC_DNS=`wget -q -O - http://instance-data.ec2.internal/latest/meta-data/public-hostname`
fi
fi