2 files changed, 32 insertions, 3 deletions

diff --git a/ci/deploy.sh b/ci/deploy.sh
index abf3866b..663e9f6c 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
             ;;