diff options
| author | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-01-26 22:59:22 -0800 |
|---|---|---|
| committer | Shivaram Venkataraman <shivaram@eecs.berkeley.edu> | 2013-01-26 23:03:11 -0800 |
| commit | 717b221cca79cb8a1603e9dcf7f0bb50e215ac41 (patch) | |
| tree | 745b5dcdf510a9ee161e3c39cddc0183bf8fdd71 /bin/start-master.sh | |
| parent | 2435b7b5b77fe3e30fc8175983460ceb7a70632e (diff) | |
| download | spark-717b221cca79cb8a1603e9dcf7f0bb50e215ac41.tar.gz spark-717b221cca79cb8a1603e9dcf7f0bb50e215ac41.tar.bz2 spark-717b221cca79cb8a1603e9dcf7f0bb50e215ac41.zip | |
Detect whether we run on EC2 using ec2-metadata as well
Diffstat (limited to 'bin/start-master.sh')
| -rwxr-xr-x | bin/start-master.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/start-master.sh b/bin/start-master.sh index a901b1c260..87feb261fe 100755 --- a/bin/start-master.sh +++ b/bin/start-master.sh @@ -26,7 +26,8 @@ fi # Set SPARK_PUBLIC_DNS so the master report the correct webUI address to the slaves 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 |