diff --git a/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst b/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst index 2ff92f918..75d981311 100644 --- a/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst +++ b/docs/source/guides/admin-guides/references/man8/xcatconfig.8.rst @@ -104,7 +104,7 @@ OPTIONS \ **-f|-**\ **-force**\ The force option may be used after the install to reinitialize the Management Node. This option will regenerate keys, credential and reinititialize the site table. This option should be used, if keys or credentials become corrupt or lost. - Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stoped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs. + Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stopped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs. A new set of common ssh host keys will have been generated for the nodes. If you wish your nodes to be able to ssh to each other with out password intervention, then you should redistribute these new keys to the nodes. If the nodes hostkeys are updated then you will need to remove their entries from the known_hosts files on the management node before using ssh, xdsh, xdcp. Redistribute credentials and ssh keys to the service nodes and ssh keys to the nodes by using the updatenode -k command. diff --git a/xCAT-client/pods/man8/xcatconfig.8.pod b/xCAT-client/pods/man8/xcatconfig.8.pod index 1f4f926b0..7d7e73be7 100644 --- a/xCAT-client/pods/man8/xcatconfig.8.pod +++ b/xCAT-client/pods/man8/xcatconfig.8.pod @@ -64,7 +64,7 @@ This option will reinitialize the basic xCAT database table setup. It will not =item B<-f|--force> The force option may be used after the install to reinitialize the Management Node. This option will regenerate keys, credential and reinititialize the site table. This option should be used, if keys or credentials become corrupt or lost. -Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stoped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs. +Additional action must be taken after using the force options. ssh keys must be redistributed to the nodes, site table attributes might need to be restored, makeconservercf needs to be rerun to pick up the new credentials and conserver stopped and started, rspconfig needs to be rerun to distribute the new keys to the MM and the HMCs. A new set of common ssh host keys will have been generated for the nodes. If you wish your nodes to be able to ssh to each other with out password intervention, then you should redistribute these new keys to the nodes. If the nodes hostkeys are updated then you will need to remove their entries from the known_hosts files on the management node before using ssh, xdsh, xdcp. Redistribute credentials and ssh keys to the service nodes and ssh keys to the nodes by using the updatenode -k command. diff --git a/xCAT-rmc/plugin/rmcmon.pm b/xCAT-rmc/plugin/rmcmon.pm index 5d3981166..5bde31561 100644 --- a/xCAT-rmc/plugin/rmcmon.pm +++ b/xCAT-rmc/plugin/rmcmon.pm @@ -144,7 +144,7 @@ sub start { } } elsif ($assocHash{"$cond:_:$resp"}==1) { $result=`/usr/bin/stopcondresp $cond $resp 2>&1`; - if (($?) && ($result !~ /2618-264/)) { #stoped + if (($?) && ($result !~ /2618-264/)) { #stopped my $rsp={}; $rsp->{data}->[0]="$localhostname: $result"; $callback->($rsp); @@ -219,7 +219,7 @@ sub start { This function gets called when monstop command is issued by the user. It stops the monitoring on all nodes, stops the RMC daemons. Arguments: - p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both monservers and nodes, @@ -265,7 +265,7 @@ sub stop { if (@tmp1 < 4) { next; } if ($tmp1[3] !~ /Not|not/) { my $result=`/usr/bin/stopcondresp $tmp1[0] $tmp1[1] 2>&1`; - if (($?) && ($result !~ /2618-264/)) { #stoped + if (($?) && ($result !~ /2618-264/)) { #stopped if ($callback) { my $rsp={}; $rsp->{data}->[0]="$localhostname: $result"; @@ -805,7 +805,7 @@ sub stopNodeStatusMon { } if ($batch) { my $result=`stopcondresp NodeReachability_Batch UpdatexCATNodeStatus_Batch 2>&1`; - if (($?) && ($result !~ /2618-264/)) { #stoped + if (($?) && ($result !~ /2618-264/)) { #stopped $retcode=$?; $retmsg="Error stop node status monitoring: $result"; reportError($retmsg, $callback); @@ -816,14 +816,14 @@ sub stopNodeStatusMon { #stop monitoring the status of mn's immediate children my $result=`stopcondresp NodeReachability UpdatexCATNodeStatus 2>&1`; - if (($?) && ($result !~ /2618-264/)) { #stoped + if (($?) && ($result !~ /2618-264/)) { #stopped $retcode=$?; $retmsg="Error stop node status monitoring: $result"; reportError($retmsg, $callback); } #stop monitoring the status of mn's grandchildren via their service nodes $result=`stopcondresp NodeReachability_H UpdatexCATNodeStatus 2>&1`; - if (($?) && ($result !~ /2618-264/)) { #stoped + if (($?) && ($result !~ /2618-264/)) { #stopped $retcode=$?; $retmsg="Error stop node status monitoring: $result"; reportError($retmsg, $callback); diff --git a/xCAT-server/lib/xcat/monitoring/gangliamon.pm b/xCAT-server/lib/xcat/monitoring/gangliamon.pm index 3df914d62..c3b9b62f9 100755 --- a/xCAT-server/lib/xcat/monitoring/gangliamon.pm +++ b/xCAT-server/lib/xcat/monitoring/gangliamon.pm @@ -755,7 +755,7 @@ sub deconfGmetad { Ganglia monitoring. Arguments: - p_nodes -- A pointer to an arrays of nodes to be stoped for monitoring. null means all. + p_nodes -- A pointer to an arrays of nodes to be stopped for monitoring. null means all. scope -- The action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means all nodes (except localhost), diff --git a/xCAT-server/lib/xcat/monitoring/monitorctrl.pm b/xCAT-server/lib/xcat/monitoring/monitorctrl.pm index 776d6bf3b..65848d01b 100644 --- a/xCAT-server/lib/xcat/monitoring/monitorctrl.pm +++ b/xCAT-server/lib/xcat/monitoring/monitorctrl.pm @@ -405,10 +405,10 @@ sub stopMonitoring { It stops the given plug-in for node status monitoring. If no plug-in is specified, use the one in the monitoring table. Arguments: - name -- name of the monitoring plu-in module to be stoped for node status monitoring. + name -- name of the monitoring plu-in module to be stopped for node status monitoring. If none is specified, use the one in the monitoring table that has the "nodestatmon" column set to be "1", or "Yes". - p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means local host only. 2 means both local host and nodes, diff --git a/xCAT-server/lib/xcat/monitoring/nagiosmon.pm b/xCAT-server/lib/xcat/monitoring/nagiosmon.pm index 4f0acb8cc..9679a1bba 100644 --- a/xCAT-server/lib/xcat/monitoring/nagiosmon.pm +++ b/xCAT-server/lib/xcat/monitoring/nagiosmon.pm @@ -110,7 +110,7 @@ sub start { This function gets called when monstop command is issued by the user. It stops the monitoring on all nodes, stops the Nagios daemons. Arguments: - p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both monservers and nodes, diff --git a/xCAT-server/lib/xcat/monitoring/pcpmon.pm b/xCAT-server/lib/xcat/monitoring/pcpmon.pm index 0fdc7f405..d0404a8f8 100644 --- a/xCAT-server/lib/xcat/monitoring/pcpmon.pm +++ b/xCAT-server/lib/xcat/monitoring/pcpmon.pm @@ -220,7 +220,7 @@ sub deconfig the daemons and does necessary cleanup process for the PCP monitoring. Arguments: - p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both monservers and nodes, diff --git a/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm b/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm index 6d9142210..19913e5f6 100644 --- a/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm +++ b/xCAT-server/lib/xcat/monitoring/samples/templatemon.pm @@ -139,7 +139,7 @@ sub start { shoul only be applied on the local host. If it is 2, then it should be applied to the children that the local host is monitoring. Arguments: - p_nodes -- a pointer to an arrays of nodes to be stoped. null means all. + p_nodes -- a pointer to an arrays of nodes to be stopped. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both localhost and nodes, @@ -256,7 +256,7 @@ sub startNodeStatusMon { This function is called by the monitorctrl module when monstop command is issued. It stops feeding the node status info back to xCAT. Arguments: - p_nodes -- a pointer to an arrays of nodes to stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both monservers and nodes, diff --git a/xCAT-server/lib/xcat/monitoring/snmpmon.pm b/xCAT-server/lib/xcat/monitoring/snmpmon.pm index 220b157b7..b133b1785 100644 --- a/xCAT-server/lib/xcat/monitoring/snmpmon.pm +++ b/xCAT-server/lib/xcat/monitoring/snmpmon.pm @@ -123,7 +123,7 @@ sub start { =head3 stop This function gets called by the monitorctrl module when monstop command gets called. Arguments: - p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both monservers and nodes, @@ -226,7 +226,7 @@ sub startNodeStatusMon { This function is called by the monitorctrl module when monstop command is issued. It stops feeding the node status info back to xCAT. Arguments: - p_nodes -- a pointer to an arrays of nodes to stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means local host only. 2 means both local host and nodes, diff --git a/xCAT-server/lib/xcat/monitoring/xcatmon.pm b/xCAT-server/lib/xcat/monitoring/xcatmon.pm index 651c11bf7..61db830a0 100644 --- a/xCAT-server/lib/xcat/monitoring/xcatmon.pm +++ b/xCAT-server/lib/xcat/monitoring/xcatmon.pm @@ -53,7 +53,7 @@ sub start { =head3 stop This function gets called by the monitorctrl module when monstop command gets called. Arguments: - p_nodes -- a pointer to an arrays of nodes to be stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to be stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both monservers and nodes, @@ -185,7 +185,7 @@ sub startNodeStatusMon This function is called by the monitorctrl module when monstop command is issued. It stops feeding the node status info back to xCAT. Arguments: - p_nodes -- a pointer to an arrays of nodes to stoped for monitoring. null means all. + p_nodes -- a pointer to an arrays of nodes to stopped for monitoring. null means all. scope -- the action scope, it indicates the node type the action will take place. 0 means localhost only. 2 means both monservers and nodes, diff --git a/xCAT-server/lib/xcat/plugins/docker.pm b/xCAT-server/lib/xcat/plugins/docker.pm index b3f9da7c9..48376a45b 100755 --- a/xCAT-server/lib/xcat/plugins/docker.pm +++ b/xCAT-server/lib/xcat/plugins/docker.pm @@ -272,7 +272,7 @@ my %command_states = ( A string to explain the http response code Usage example: http_state_code_info('304', "INIT_TO_WAIT_FOR_START_DONE") -> "Already started" - http_state_code_info('304', "INIT_TO_WAIT_FOR_STOP_DONE") -> "Already stoped" + http_state_code_info('304', "INIT_TO_WAIT_FOR_STOP_DONE") -> "Already stopped" =cut #------------------------------------------------------- @@ -289,7 +289,7 @@ sub http_state_code_info { return [0, "container already started"]; } else { - return [0, "container already stoped"]; + return [0, "container already stopped"]; } } else { diff --git a/xCAT-server/lib/xcat/plugins/monctrlcmds.pm b/xCAT-server/lib/xcat/plugins/monctrlcmds.pm index 453b74947..85c7e6cd5 100644 --- a/xCAT-server/lib/xcat/plugins/monctrlcmds.pm +++ b/xCAT-server/lib/xcat/plugins/monctrlcmds.pm @@ -494,7 +494,7 @@ sub monstart { name where name is the monitoring plug-in name. For example: rmcmon. - The specified plug-in will be stoped for monitoring the xCAT cluster. + The specified plug-in will be stopped for monitoring the xCAT cluster. noderange a range of nodes. Default is all. -r|--remote indicates that both monservers and the nodes need to be called to stop the monitoring. The defaults is monservers only.