summaryrefslogtreecommitdiffstats
path: root/ci/util.sh
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-06-30 12:53:56 -0400
committerTim Rozet <trozet@redhat.com>2016-07-01 23:03:15 -0400
commit03f6cb884b4ba8ac3d03000bc94b7816160da1c6 (patch)
tree4eb2304b86a0d26c65851ab5b3b44101a5bf707b /ci/util.sh
parent398b356523bda62fab449fd2d79ef689e46c604b (diff)
Adds overcloud ssh support and other fixes
Changes include: - Copies root pub key to overcloud nodes - Introduces overcloud util command to login control/computes - Minor fixes to undercloud util command JIRA: APEX-192 Change-Id: I903fda4b1d232fc623137490630ac905ebb781d7 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci/util.sh')
-rwxr-xr-xci/util.sh22
1 files changed, 19 insertions, 3 deletions
diff --git a/ci/util.sh b/ci/util.sh
index b262c20..f55e1e0 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
;;