Merge "Adds overcloud ssh support and other fixes"

1 files changed, 38 insertions, 3 deletions

diff --git a/lib/utility-functions.sh b/lib/utility-functions.sh
index 17fdfafd..93050701 100644
--- a/lib/utility-functions.sh
+++ b/lib/utility-functions.sh
@@ -2,6 +2,8 @@
 # Utility Functions used by  OPNFV Apex
 # author: Tim Rozet (trozet@redhat.com)
 
+SSH_OPTIONS=(-o StrictHostKeyChecking=no -o GlobalKnownHostsFile=/dev/null -o UserKnownHostsFile=/dev/null -o LogLevel=error)
+
 ##connects to undercloud
 ##params: user to login with, command to execute on undercloud (optional)
 function undercloud_connect {
@@ -13,14 +15,47 @@ function undercloud_connect {
   fi
 
   if [ -z "$2" ]; then
-    ssh ${user}@$(arp -a | grep $(virsh domiflist undercloud | grep default |\
+    ssh ${SSH_OPTIONS[@]} ${user}@$(arp -a | grep $(virsh domiflist undercloud | grep default |\
     awk '{print $5}') | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
   else
-    ssh -T ${user}@$(arp -a | grep $(virsh domiflist undercloud | grep default \
+    ssh ${SSH_OPTIONS[@]} -T ${user}@$(arp -a | grep $(virsh domiflist undercloud | grep default \
     | awk '{print $5}') | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+") "$2"
   fi
 }
 
+##connects to overcloud nodes
+##params: node to login to, command to execute on overcloud (optional)
+function overcloud_connect {
+  local node
+  local node_output
+  local node_ip
+
+  if [ -z "$1" ]; then
+    echo "Missing required argument: overcloud node to login to"
+    return 1
+  elif ! echo "$1" | grep -E "(controller|compute)[0-9]+" > /dev/null; then
+    echo "Invalid argument: overcloud node to login to must be in the format: \
+controller<number> or compute<number>"
+    return 1
+  fi
+
+  node_output=$(undercloud_connect "stack" "source stackrc; nova list")
+  node=$(echo "$1" | sed -E 's/([a-zA-Z]+)([0-9]+)/\1-\2/')
+
+  node_ip=$(echo "$node_output" | grep "$node" | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
+
+  if [ "$node_ip" == "" ]; then
+    echo -e "Unable to find IP for ${node} in \n${node_output}"
+    return 1
+  fi
+
+  if [ -z "$2" ]; then
+    ssh ${SSH_OPTIONS[@]} heat-admin@${node_ip}
+  else
+    ssh ${SSH_OPTIONS[@]} -T heat-admin@${node_ip} "$2"
+  fi
+}
+
 ##outputs heat stack deployment failures
 ##params: none
 function debug_stack {
@@ -46,4 +81,4 @@ function debug_stack {
   done
 
   echo -e $failure_output
-}
\ No newline at end of file
+}