summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-07-05 17:25:17 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-07-05 17:25:17 +0000
commit908ec812c1305a59d2009cb6d3dac4c4afa6199d (patch)
tree40a6e45e61d89abe957e680b071a68cd167963cb
parent7398338596cb4fc5dc6a884b05a2ab81b32d5b06 (diff)
parent03f6cb884b4ba8ac3d03000bc94b7816160da1c6 (diff)
Merge "Adds overcloud ssh support and other fixes"
-rwxr-xr-xci/deploy.sh13
-rwxr-xr-xci/util.sh22
-rw-r--r--lib/utility-functions.sh41
3 files changed, 70 insertions, 6 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 2b1de1d9..bcd8a6bb 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1083,6 +1083,19 @@ function configure_post_install {
echo -e "${blue}INFO: Post Install Configuration Running...${reset}"
+ echo -e "${blue}INFO: Configuring ssh for root to overcloud nodes...${reset}"
+ # copy host key to instack
+ scp ${SSH_OPTIONS[@]} /root/.ssh/id_rsa.pub "stack@$UNDERCLOUD":jumphost_id_rsa.pub
+
+ # add host key to overcloud nodes authorized keys
+ ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" << EOI
+source stackrc
+nodes=\$(nova list | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
+for node in \$nodes; do
+cat ~/jumphost_id_rsa.pub | ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" 'cat >> ~/.ssh/authorized_keys'
+done
+EOI
+
ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI
source overcloudrc
set -o errexit
diff --git a/ci/util.sh b/ci/util.sh
index b262c203..f55e1e0f 100755
--- a/ci/util.sh
+++ b/ci/util.sh
@@ -5,7 +5,7 @@
CONFIG=${CONFIG:-'/var/opt/opnfv'}
RESOURCES=${RESOURCES:-"$CONFIG/images"}
LIB=${LIB:-"$CONFIG/lib"}
-VALID_CMDS="undercloud debug-stack -h --help"
+VALID_CMDS="undercloud overcloud debug-stack -h --help"
source $LIB/utility-functions.sh
@@ -22,7 +22,11 @@ resolve_cmd() {
display_usage() {
echo -e "Usage:\n$0 [arguments] \n"
- echo -e " undercloud <user> : Connect to Undercloud VM as <user>\n"
+ echo -e " undercloud <user> <command> : Connect to Undercloud VM as <user> and execute command <command>\n"
+ echo -e " <user> Optional: Defaults to 'stack', <command> Optional: Defaults to none\n"
+ echo -e " overcloud <node> <command> : Connect to an Overcloud <node> and execute command <command>\n"
+ echo -e " <node> Required in format controller|compute<number>. Example: controller0\n"
+ echo -e " <command> Optional: Defaults to none\n"
echo -e " debug-stack : Print parsed deployment failures to stdout \n"
}
@@ -52,8 +56,20 @@ parse_cmdline() {
if [ -z "$2" ]; then
# connect as stack by default
undercloud_connect stack
+ elif [ -z "$3" ]; then
+ undercloud_connect "$2"
else
- undercloud_connect $2
+ undercloud_connect "$2" "$3"
+ fi
+ exit 0
+ ;;
+ overcloud)
+ if [ -z "$2" ]; then
+ overcloud_connect
+ elif [ -z "$3" ]; then
+ overcloud_connect "$2"
+ else
+ overcloud_connect "$2" "$3"
fi
exit 0
;;
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
+}