xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1952 from cxhong/1853

Browse Source 
Remove -t option for bmcdiscover and used by default
This commit is contained in:
Victor Hu 2016-10-12 15:02:23 -04:00 committed by GitHub
commit 8dda0dc49e
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/mtms/discovery_using_defined.rst
View File

@ -27,11 +27,11 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
#. Detect the BMCs and add the node definitions into xCAT.
Use the ``bmcdiscover`` command to discover the BMCs responding over an IP range and automatically write the output into the xCAT database. You **must** use the ``-t`` option to indicate node type is bmc and the ``-w`` option to automatically write the output into the xCAT database.
Use the ``bmcdiscover`` command to discover the BMCs responding over an IP range and automatically write the output into the xCAT database. You **must** use the ``-w`` option to automatically write the output into the xCAT database.
To discover the BMC with an IP address of 172.30.0.1, use the command: ::
bmcdiscover --range 172.30.0.1 -t -z -w
bmcdiscover --range 172.30.0.1 -z -w
The discovered nodes will be written to xCAT database: ::
@ -47,6 +47,7 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
postbootscripts=otherpkgs
postscripts=syslog,remoteshell,syncfiles
serial=10112CA
nodetype=mp
#. **Pre-define** the compute nodes:
@ -68,6 +69,8 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
mgt=ipmi
mtm=8247-22L
serial=10112CA
nodetype=mp
hwtype=bmc
#. Edit the ``predefined.stanzas`` file and change the discovered nodes to the intended ``hostname`` and ``IP address``.
@ -84,6 +87,8 @@ The BMC IP address is obtained by the open range dhcp server and the plan in thi
ip=10.1.2.1
#. Remove ``nodetype`` and ``hwtype`` from ``predefined.stanza`` file based on the MTMS mapping.
#. Repeat for additional nodes in the ``predefined.stanza`` file based on the MTMS mapping.

4
docs/source/guides/admin-guides/manage_clusters/ppc64le/discovery/pbmc_discovery_with_bmcdiscover.rst
View File

@ -5,7 +5,7 @@ After environment is ready, and the server is powered, we can start server disco
The following command can be used to discovery BMC within an IP range and write the discovered node definition into xCAT database::
bmcdiscover -s nmap --range 50.0.100.1-100 -t -z -w
bmcdiscover -s nmap --range 50.0.100.1-100 -z -w
The discovered BMC node will be like this::
@ -27,7 +27,7 @@ The discovered BMC node will be like this::
2. bmcdiscover will use username/password pair set in ``passwd`` table with **key** equal **ipmi**. If you'd like to use other username/password pair, you can use ::
bmcdiscover -s nmap --range 50.0.100.1-100 -t -z -w -u <username> -p <password>
bmcdiscover -s nmap --range 50.0.100.1-100 -z -w -u <username> -p <password>
Start discovery process
-----------------------

8
docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst
View File

@ -23,7 +23,7 @@ SYNOPSIS
\ **bmcdiscover**\ [\ **-v | -**\ **-version**\ ]
\ **bmcdiscover**\ [\ **-s**\ \ *scan_method*\ ] [\ **-u**\ \ *bmc_user*\ ] [\ **-p**\ \ *bmc_passwd*\ ] [\ **-z**\ ] [\ **-w**\ ] [\ **-t**\ ] \ **-**\ **-range**\ \ *ip_ranges*\
\ **bmcdiscover**\ [\ **-s**\ \ *scan_method*\ ] [\ **-u**\ \ *bmc_user*\ ] [\ **-p**\ \ *bmc_passwd*\ ] [\ **-z**\ ] [\ **-w**\ ] \ **-**\ **-range**\ \ *ip_ranges*\
\ **bmcdiscover**\ \ **-u**\ \ *bmc_user*\ \ **-p**\ \ *bmc_passwd*\ \ **-i**\ \ *bmc_ip*\ \ **-**\ **-check**\
@ -74,12 +74,6 @@ OPTIONS
\ **-t**\
Generate a BMC type node object
\ **-i|-**\ **-bmcip**\
BMC IP address.

6
xCAT-client/pods/man1/bmcdiscover.1.pod
View File

@ -8,7 +8,7 @@ B<bmcdiscover> [B<-?>|B<-h>|B<--help>]
B<bmcdiscover> [B<-v>|B<--version>]
B<bmcdiscover> [B<-s> I<scan_method>] [B<-u> I<bmc_user>] [B<-p> I<bmc_passwd>] [B<-z>] [B<-w>] [B<-t>] B<--range> I<ip_ranges>
B<bmcdiscover> [B<-s> I<scan_method>] [B<-u> I<bmc_user>] [B<-p> I<bmc_passwd>] [B<-z>] [B<-w>] B<--range> I<ip_ranges>
B<bmcdiscover> B<-u> I<bmc_user> B<-p> I<bmc_passwd> B<-i> I<bmc_ip> B<--check>
@ -45,10 +45,6 @@ List the data returned in xCAT stanza format
Write to the xCAT database.
=item B<-t>
Generate a BMC type node object
=item B<-i|--bmcip>
BMC IP address.

13
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@ -115,7 +115,7 @@ sub bmcdiscovery_usage {
push @{ $rsp->{data} }, "Usage:";
push @{ $rsp->{data} }, "\tbmcdiscover [-?|-h|--help]";
push @{ $rsp->{data} }, "\tbmcdiscover [-v|--version]";
push @{ $rsp->{data} }, "\tbmcdiscover [-s scan_method] [-u bmc_user] [-p bmc_passwd] [-z] [-w] [-t] --range ip_range\n";
push @{ $rsp->{data} }, "\tbmcdiscover [-s scan_method] [-u bmc_user] [-p bmc_passwd] [-z] [-w] --range ip_range\n";
push @{ $rsp->{data} }, "\tCheck BMC administrator User/Password:\n";
push @{ $rsp->{data} }, "\t\tbmcdiscover -u bmc_user -p bmc_password -i bmc_ip --check\n";
@ -255,6 +255,13 @@ sub bmcdiscovery_processargs {
return 1;
}
if ($::opt_T) {
my $msg = "The -t option is deprecated and will be ignored";
my $rsp = {};
push @{ $rsp->{data} }, "$msg";
xCAT::MsgUtils->message("W", $rsp, $::CALLBACK);
}
scan_process($::opt_M, $::opt_R, $::opt_Z, $::opt_W, $request_command);
return 0;
}
@ -935,9 +942,7 @@ sub bmcdiscovery_ipmi {
} else {
$ip .= ",,";
}
if ($::opt_T) {
$ip .= ",mp,bmc";
}
$ip .= ",mp,bmc";
if ($mtm and $serial) {
$node = "node-$mtm-$serial";
$node =~ s/(.*)/\L$1/g;