xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-07-08 22:01:30 +00:00
Code Issues Releases Wiki Activity

Add new service related keyword into site table: consoleservice

Browse Source 
[Devops Task 10075]

The behavior changes between 2.9.1 and 2.10.  The keyword is
provided for those users who want to try out confluent in the 2.9.1
timeframe.  Confluent is planned to be packaged better and the
default console for 2.10.  conserver will still be shipped to
provide console for the systems not supported by confluent.
This commit is contained in:
Victor Hu
2015-02-04 15:36:30 -05:00
parent 036ca664d7
commit 85081d50cc
3 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
perl-xCAT/xCAT/Schema.pm
View File

@ -1129,6 +1129,7 @@ site => {
" consoleondemand: When set to 'yes', conserver connects and creates the console\n".
" output only when the user opens the console. Default is no on\n".
" Linux, yes on AIX.\n\n".
" consoleservice: The console service to be used by xCAT. Default is conserver\n\n",
" httpport: The port number that the booting/installing nodes should contact the\n".
" http server on the MN/SN on. It is your responsibility to configure\n".
" the http server to listen on that port - xCAT will not do that.\n\n".

10
xCAT-server/lib/xcat/plugins/confluent.pm
View File

@ -97,6 +97,16 @@ sub preprocess_request {
return;
}
#
# check the site "consoleservice" configuration.
# 2.9.X, if not defined, do not allow makeconfluentcfg run (default is conserver)
# if defined and NOT confluent, prevent this command from running
my $consoleservice=xCAT::TableUtils->get_site_attribute("consoleservice");
if (!$consoleservice || $consoleservice ne "confluent") {
$callback->({data=>"ERROR: confluent is not configured as the xCAT console service in the site table. \nConfigure consoleservice=confluent and install xCAT-confluent."});
$request = {};
return;
}
# get site master
my $master=xCAT::TableUtils->get_site_Master();

14
xCAT-server/lib/xcat/plugins/conserver.pm
View File

@ -96,8 +96,18 @@ sub preprocess_request {
$request = {};
return;
}
#
# check the site "consoleservice" configuration.
# 2.9.X, if not defined, default to conserver
# if defined and confluent, prevent this command from running
my $consoleservice=xCAT::TableUtils->get_site_attribute("consoleservice");
if ($consoleservice && $consoleservice eq "confluent") {
$callback->({data=>"ERROR: confluent is configured as the xCAT console service in the site table, try makeconfluentcfg"});
$request = {};
return;
}
# get site master
my $master=xCAT::TableUtils->get_site_Master();
if (!$master) { $master=hostname(); }