arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add xcatconfig -m to put management node in the DB correctly

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13165 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-06-26 12:35:12 +00:00
parent 2e7f1599fe
commit 66cc3be938
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
xCAT-server/sbin/xcatconfig
View File

@ -51,6 +51,7 @@ if (
'i|initinstall' => \$::INITIALINSTALL,
'u|updateinstall' => \$::UPDATEINSTALL,
'k|sshkeys' => \$::genSSHRootKeys,
'm|mgtnode' => \$::setupMNinDB,
's|sshnodehostkeys' => \$::genSSHNodeHostKeys,
'c|credentials' => \$::genCredentials,
'd|database' => \$::initDB,
@ -73,6 +74,7 @@ if ( (!$::HELP)
&& (!$::genSSHRootKeys)
&& (!$::genSSHNodeHostKeys)
&& (!$::genCredentials)
&& (!$::setupMNinDB)
&& (!$::initDB)
&& (!$::VERSION))
{
@ -183,23 +185,6 @@ chomp $::root;
# some Linux-only config
# Do not need to start vsftpd here, because when xcatd starts, it will restart it
#if ($::osname eq 'Linux')
#{
# start vsftpd
# my $cmd = "/sbin/chkconfig vsftpd on";
# my $outref = xCAT::Utils->runcmd("$cmd", 0);
# my $cmd = "/etc/init.d/vsftpd restart";
# my $outref = xCAT::Utils->runcmd("$cmd", 0);
# if ($::RUNCMD_RC != 0)
# {
# xCAT::MsgUtils->message('E', "Could not start VSFTPD.");
# }
# else
# {
# xCAT::MsgUtils->message('I', "VSFTPD has been restarted.");
# }
#} # end Linux-only
#
# Generate ssh host keys for the nodes
@ -381,7 +366,7 @@ if ($::INITIALINSTALL || $::FORCE)
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message('E',
"Could not remove $::TFTPDIR/pxelinux.cfg/default");
"Could not remove $::TFTPDIR/pxelinux.cfg/default");
}
else
{
@ -425,7 +410,10 @@ END
}
}
}
# if xcatconfig -m request to setup the management node in the database
if ($::setupMNinDB) {
&setupMNinDB;
}
exit;
#####################################
@ -450,7 +438,7 @@ sub usage
);
xCAT::MsgUtils->message(
'I',
"xcatconfig [-h|--help]\nxcatconfig [-v|--version]\nxcatconfig [-f|--force] [-V|--verbose]\nxcatconfig [-i|--initinstall] [-V|--verbose]\nxcatconfig [-u|--updateinstall] [-V|--verbose]\nxcatconfig [-k|--sshkeys] [-s|--sshnodehostkeys] [-c|--credentials] [-d|database] [-V|--verbose]"
"xcatconfig [-h|--help]\nxcatconfig [-v|--version]\nxcatconfig [-f|--force] [-V|--verbose]\nxcatconfig [-i|--initinstall] [-V|--verbose]\nxcatconfig [-u|--updateinstall] [-V|--verbose]\nxcatconfig [-k|--sshkeys] [-s|--sshnodehostkeys] [-c|--credentials] [-d|database] [-m|mgtnode] [-V|--verbose]"
);
}
@ -1857,3 +1845,30 @@ sub cleanupPSTable
return $rc
}
#-----------------------------------------------------------------------------
=head3 setupMNinDB
Will add the management node to the database with group=mn and nodetype=mn
=cut
#-----------------------------------------------------------------------------
sub setupMNinDB
{
my $mnname = `hostname`;
chomp $mnname;
$mnname && $mnname =~ s/\..*//; # strip off domain
my $chtabcmds = "$::XCATROOT/sbin/chtab node=$mnname nodelist.groups=mn nodetype.nodetype=mn;";
my $outref = xCAT::Utils->runcmd("$chtabcmds", 0);
if ($::RUNCMD_RC != 0)
{
xCAT::MsgUtils->message('E', "Could not add $mnname to the dateabase.");
}
else
{
verbose("Added $mnname to the database.");
}
return;
}