summaryrefslogtreecommitdiffstats
path: root/lib/utility-functions.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-07-15 22:56:48 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-15 22:56:48 +0000
commit6ee3eda280fca9c701056a8d4c5d9cf79fc1cfb7 (patch)
treef93c2b60efd23b5c1f11896cbbf9363fc78638a0 /lib/utility-functions.sh
parent88d5b2462933cce79cb059c81e007ec83ee2cd9e (diff)
parentc1b82d85dcf815764cb4247bedfee4ca491e2d57 (diff)
Merge "Scripts for running smoke tests on the undercloud VM. Tested against Apex Brahmaputra as I have had many issues getting a Colorado environment up and running."
Diffstat (limited to 'lib/utility-functions.sh')
-rw-r--r--lib/utility-functions.sh13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/utility-functions.sh b/lib/utility-functions.sh
index 93050701..f73a2d85 100644
--- a/lib/utility-functions.sh
+++ b/lib/utility-functions.sh
@@ -15,14 +15,19 @@ function undercloud_connect {
fi
if [ -z "$2" ]; then
- 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]+")
+ ssh ${SSH_OPTIONS[@]} ${user}@$(get_undercloud_ip)
else
- 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"
+ ssh ${SSH_OPTIONS[@]} -T ${user}@$(get_undercloud_ip) "$2"
fi
}
+##outputs the Undercloud's IP address
+##params: none
+function get_undercloud_ip {
+ echo $(arp -a | grep $(virsh domiflist undercloud | grep default |\
+ awk '{print $5}') | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
+}
+
##connects to overcloud nodes
##params: node to login to, command to execute on overcloud (optional)
function overcloud_connect {