Merge pull request #1245 from carlpulley/ensure_hostname_in_hosts

Issue #1240: Updated ensure_hostname_in_hosts to use SSH_CONNECTION

compute/src/test/resources/initscript_with_java.sh

@@ -115,10 +115,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

compute/src/test/resources/initscript_with_jetty.sh

@@ -115,10 +115,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

compute/src/test/resources/runscript.sh

@@ -115,10 +115,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

labs/virtualbox/src/test/resources/test_guest_additions_installer_init.sh

@@ -112,10 +112,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

scriptbuilder/src/main/resources/functions/setupPublicCurl.sh

@@ -30,10 +30,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

scriptbuilder/src/test/resources/test_install_chef_gems_scriptbuilder.sh

@@ -115,10 +115,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

scriptbuilder/src/test/resources/test_install_git_scriptbuilder.sh

@@ -115,10 +115,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

scriptbuilder/src/test/resources/test_install_jdk_scriptbuilder.sh

@@ -115,10 +115,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns

scriptbuilder/src/test/resources/test_install_ruby_scriptbuilder.sh

@@ -115,10 +115,13 @@ function ensure_netutils_yum() {
 # most network services require that the hostname is in
 # the /etc/hosts file, or they won't operate
 function ensure_hostname_in_hosts() {
-  # NOTE: 
-  # 1. We blindly trust existing hostname settings in /etc/hosts
-  # 2. We assume hostname supports the -i option to return the default NICs IP address
-  egrep -q `hostname` /etc/hosts || echo "`hostname -i` `hostname`" >> /etc/hosts
+  [ -n "$SSH_CONNECTION" ] && {
+    local ipaddr=`echo $SSH_CONNECTION | awk '{print $3}'`
+  } || {
+    local ipaddr=`hostname -i`
+  }
+  # NOTE: we blindly trust existing hostname settings in /etc/hosts
+  egrep -q `hostname` /etc/hosts || echo "$ipaddr `hostname`" >> /etc/hosts
 }
 
 # download locations for many services are at public dns