diff --git a/xCAT-client/bin/updatenode b/xCAT-client/bin/updatenode index c2c2e2a73..957a2c5cc 100755 --- a/xCAT-client/bin/updatenode +++ b/xCAT-client/bin/updatenode @@ -81,9 +81,9 @@ push (@{$cmdref->{arg}}, @ARGV); # check the syntax if ( !GetOptions( - 'A|updateallsw' => \$::ALLSW, + 'A|updateallsw' => \$::ALLSW, 'c|cmdlineonly' => \$::CMDLINE, - 'd=s' => \$::ALTSRC, + 'd=s' => \$::ALTSRC, 'h|help' => \$::HELP, 'v|version' => \$::VERSION, 'V|verbose' => \$::VERBOSE, @@ -98,6 +98,7 @@ if ( 'o|os:s' => \$::OS, 'fanout=i' => \$::fanout, 't|timetout=i' => \$::timeout, + 'n|noverify' => \$::NOVERIFY, ) ) { &updatenode_usage(); diff --git a/xCAT-client/pods/man1/updatenode.1.pod b/xCAT-client/pods/man1/updatenode.1.pod index fb7478a2c..df1fc6de0 100644 --- a/xCAT-client/pods/man1/updatenode.1.pod +++ b/xCAT-client/pods/man1/updatenode.1.pod @@ -4,7 +4,7 @@ B - Update nodes in an xCAT cluster environment. =head1 SYNOPSIS -B B [B<-V>|B<--verbose>] [B<-F>|B<--sync>] [B<-f>|B<--snsync>] [B<-S>|B<--sw>] [B<-l> I] [B<-P>|B<--scripts> [B]] [B<-s>|B<--sn>] [B<-A>|B<--updateallsw>] [B<-c>|B<--cmdlineonly>] [B<-d alt_source_dir>] [B<--fanout>] [B<-t timeout>} [B [B]] +B B [B<-V>|B<--verbose>] [B<-F>|B<--sync>] [B<-f>|B<--snsync>] [B<-S>|B<--sw>] [B<-l> I] [B<-P>|B<--scripts> [B]] [B<-s>|B<--sn>] [B<-A>|B<--updateallsw>] [B<-c>|B<--cmdlineonly>] [B<-d alt_source_dir>] [B<--fanout>] [B<-t timeout>} [B [B]] [B<-n>|B<--noverify>] B B [B<-k>|B<--security>] [B<-t timeout>] @@ -368,6 +368,10 @@ be run during install. You should use updatenode -F instead. Specifies that node software should be updated. In Sysclone environment, specifies pushing the delta changes to target nodes. +=item B<-n|--noverify> + +Specifies that node network availability verification will be skipped. + =item B<-s|--sn> Set the server information stored on the nodes in /opt/xcat/xcatinfo on Linux. diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm index 860f83dc9..9f79879d3 100644 --- a/xCAT-server/lib/xcat/plugins/updatenode.pm +++ b/xCAT-server/lib/xcat/plugins/updatenode.pm @@ -209,7 +209,7 @@ sub preprocess_updatenode } # parse the options - my ($ALLSW,$CMDLINE,$ALTSRC,$HELP,$VERSION,$VERBOSE,$FILESYNC,$GENMYPOST,$USER,$SNFILESYNC,$SWMAINTENANCE,$SETSERVER,$RERUNPS,$SECURITY,$OS,$fanout,$timeout); + my ($ALLSW,$CMDLINE,$ALTSRC,$HELP,$VERSION,$VERBOSE,$FILESYNC,$GENMYPOST,$USER,$SNFILESYNC,$SWMAINTENANCE,$SETSERVER,$RERUNPS,$SECURITY,$OS,$fanout,$timeout,$NOVERIFY); Getopt::Long::Configure("bundling"); Getopt::Long::Configure("no_pass_through"); if ( @@ -231,6 +231,7 @@ sub preprocess_updatenode 'o|os:s' => \$OS, 'fanout=i' => \$fanout, 't|timetout=i' => \$timeout, + 'n|noverify' => \$NOVERIFY, ) ) @@ -252,6 +253,11 @@ sub preprocess_updatenode } else { undef $::timeout; } + if (defined($NOVERIFY)) { + $::NOVERIFY=$NOVERIFY; + } else { + undef $::NOVERIFY; + } if (defined($fanout)) { $::fanout=$fanout; } else { @@ -1078,7 +1084,7 @@ sub updatenode chomp $nimprime; # parse the options - my ($ALLSW,$CMDLINE,$ALTSRC,$HELP,$VERSION,$VERBOSE,$FILESYNC,$GENMYPOST,$USER,$SNFILESYNC,$SWMAINTENANCE,$SETSERVER,$RERUNPS,$SECURITY,$OS,$fanout,$timeout); + my ($ALLSW,$CMDLINE,$ALTSRC,$HELP,$VERSION,$VERBOSE,$FILESYNC,$GENMYPOST,$USER,$SNFILESYNC,$SWMAINTENANCE,$SETSERVER,$RERUNPS,$SECURITY,$OS,$fanout,$timeout,$NOVERIFY); Getopt::Long::Configure("bundling"); Getopt::Long::Configure("no_pass_through"); if ( @@ -1100,6 +1106,7 @@ sub updatenode 'o|os:s' => \$OS, 'fanout=i' => \$fanout, 't|timetout=i' => \$timeout, + 'n|noverify' => \$NOVERIFY, ) ) { @@ -1117,6 +1124,11 @@ sub updatenode } else { undef $::timeout; } + if (defined($NOVERIFY)) { + $::NOVERIFY=$NOVERIFY; + } else { + undef $::NOVERIFY; + } if (defined($fanout)) { $::fanout=$fanout; } else { @@ -1521,20 +1533,22 @@ sub updatenoderunps push @$args1,"--nodestatus"; # return nodestatus if (defined($::fanout)) { # fanout - push @$args1,"-f" ; - push @$args1,$::fanout; + push @$args1,"-f" ; + push @$args1,$::fanout; } if (defined($::timeout)) { # timeout - push @$args1,"-t" ; - push @$args1,$::timeout; + push @$args1,"-t" ; + push @$args1,$::timeout; } if (defined($::USER)) { # -l contains sudo user - push @$args1,"--sudo" ; - push @$args1,"-l" ; - push @$args1,"$::USER" ; + push @$args1,"--sudo" ; + push @$args1,"-l" ; + push @$args1,"$::USER" ; } push @$args1,"-s"; # streaming - push @$args1,"-v"; # streaming + if (!defined($::NOVERIFY)) { # NOVERIFY + push @$args1,"-v"; # streaming + } push @$args1,"-e"; # execute push @$args1,"$runpscmd"; # the command @@ -1946,20 +1960,22 @@ sub updatenodesoftware # build xdsh command push @$args1,"--nodestatus"; # return nodestatus if (defined($::fanout)) { # fanout - push @$args1,"-f" ; - push @$args1,$::fanout; + push @$args1,"-f" ; + push @$args1,$::fanout; } if (defined($::timeout)) { # timeout - push @$args1,"-t" ; - push @$args1,$::timeout; + push @$args1,"-t" ; + push @$args1,$::timeout; } if (defined($::USER)) { # -l contains sudo user - push @$args1,"--sudo" ; - push @$args1,"-l" ; - push @$args1,"$::USER" ; + push @$args1,"--sudo" ; + push @$args1,"-l" ; + push @$args1,"$::USER" ; } push @$args1,"-s"; # streaming - push @$args1,"-v"; # streaming + if (!defined($::NOVERIFY)) { # NOVERIFY + push @$args1,"-v"; # streaming + } push @$args1,"-e"; # execute push @$args1,"$cmd"; # the command @@ -2966,11 +2982,13 @@ sub updateAIXsoftware my $args1; push @$args1,"--nodestatus"; push @$args1,"-s"; - push @$args1,"-v"; + if (!defined($::NOVERIFY)) { # NOVERIFY + push @$args1,"-v"; + } push @$args1,"-e"; if (defined($::fanout)) { # fanout input - push @$args1,"-f" ; - push @$args1,$::fanout; + push @$args1,"-f" ; + push @$args1,$::fanout; } if (defined($::timeout)) { # timeout push @$args1,"-t" ;