diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm index 740592579..1c30dda0e 100644 --- a/perl-xCAT/xCAT/DSHCLI.pm +++ b/perl-xCAT/xCAT/DSHCLI.pm @@ -3541,12 +3541,12 @@ sub usage_dsh my $usagemsg1 = " xdsh -h \n xdsh -q \n xdsh -v \n xdsh [noderange] [group]\n"; my $usagemsg2 = - " [-B bypass ] [-C context] [-c] [-e] [-E environment_file] [-f fanout]\n"; + " [-B bypass ] [-C context] [-c] [-e] [-E environment_file] [--devicetype type_of_device] [-f fanout]\n"; my $usagemsg3 = " [-l user_ID] [-L] [-K ssh setup] "; my $usagemsg4 = "[-m] [-o options][-q] [-Q] [-r remote_shell] [-i image path]\n"; my $usagemsg5 = - " [-s] [-S ksh | csh] [-t timeout] [-T] [-X environment variables] [--devicetype type_of_device] [-v] [-z]\n"; + " [-s] [-S ksh | csh] [-t timeout] [-T] [-X environment variables] [-v] [-z]\n"; my $usagemsg6 = " [command_list]\n"; my $usagemsg7 = "Note:Context always defaults to XCAT unless -C flag is set."; diff --git a/xCAT-client/pods/man1/xdsh.1.pod b/xCAT-client/pods/man1/xdsh.1.pod index 24fede352..61e39c922 100644 --- a/xCAT-client/pods/man1/xdsh.1.pod +++ b/xCAT-client/pods/man1/xdsh.1.pod @@ -4,10 +4,10 @@ B - Concurrently runs commands on multiple nodes. =head1 B -B I [B<-B> I] [B<-C> I] [B<-e>] [B<-E> I] [B<-f> I] +B I [B<-B> I] [B<-C> I] [B<--devicetype> I] [B<-e>] [B<-E> I] [B<-f> I] [B<-K>] [B<-L>] [B<-l> I] [B<-m>] [B<-o> I] [B<-Q>] [B<-r> I] [B<-s>] [B<-S> B|B] [B<-t> I] -[B<-T>] [B<-v>] [B<-X> I] [B<--devicetype> I] [B<-z>] I +[B<-T>] [B<-v>] [B<-X> I] [B<-z>] I B [B<-i> I] I @@ -223,6 +223,15 @@ executing the I. The B and environment variables specify the remote copy command to use to export the file to node targets. +=item B<--devicetype> I + +Specify a user-defined device type that references the location +of relevant device configuration file. The devicetype value must +correspond to a valid device configuration file under the /var/opt/xcat/ +directory. +For example, /var/opt/xcat/IBSwitch/Qlogic/config is the configuration +file location if devicetype is specified as IBSwitch::Qlogic + =item B<-f>|B<--fanout> I Specifies a fanout value for the maximum number of concur- @@ -239,6 +248,11 @@ Displays usage information. Set up the SSH keys for the specified node list. Currently, this must be run on the management node (not on a remote client), because it forces itself into bypass mode. +Other device types, such as IB switch, are also supported. The +device should be defined as a node and nodetype should be defined +as switch before connecting. +Specify the user name from [-l username] option with [-K] option +if the default user name is not "root" when setup SSH keys. =item B<-l>|B<--user> I @@ -344,10 +358,6 @@ This option is useful when running B from within other scripts when you don't want the user's environment affecting the behavior of xdsh. -=item B<--devicetype> I - -Specify a user-defined device type that references the location of relevant device configuration file. The devicetype value must correspond to a valid device configuration file under the /var/opt/csm/ directory. For example, the /var/opt/csm/IBSwitch/Qlogic/config file is the location if devicetype is specified ¡°IBSwitch::Qlogic¡± - =item B<-z>|B<--exit-status> Displays the exit status for the last remotely executed @@ -460,6 +470,16 @@ userdefined. =over 3 +=item * + +To define the IB switch as node and set up the SSH keys for IB switch +B with device configuration file +B and user name B, Enter + +B I<-t node -o qswitch groups=all nodetype=switch> +B I + + =item * To run the B command on node targets B and B, enter: