xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2026-01-03 15:02:29 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/xcat/xcat-core

Browse Source
This commit is contained in:
ligc
2015-06-04 05:35:03 -04:00
parent 9a002c0517 4754a96f54
commit 6fcd7b8388
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
perl-xCAT/xCAT/DSHCLI.pm
View File

@@ -1007,21 +1007,24 @@ sub fork_fanout_dsh
my $switchents = $switchestab->getNodesAttribs($targets_waiting,[qw/switch sshusername sshpassword protocol/]);
foreach my $entry (values %$switchents) {
my $switch=$entry->[0]->{switch};
my $username = "admin";
my $username;
my $password;
my $protocol;
if (defined($entry->[0]->{sshusername})) { #use switch table first
# use switches table first
if (defined($entry->[0]->{sshusername})) {
$username = $entry->[0]->{sshusername};
if (defined($entry->[0]->{sshpassword})) {
$password = $entry->[0]->{sshpassword};
}
if (defined($entry->[0]->{protocol})) {
$protocol = $entry->[0]->{protocol};
}
}
elsif (defined($passwd_ent[0]->{username})) { #use passwd table as default
$username=$passwd_ent[0]->{username};
}
if (defined($entry->[0]->{sshpassword})) {
$password = $entry->[0]->{sshpassword};
}
if (defined($entry->[0]->{protocol})) {
$protocol = $entry->[0]->{protocol};
}
if ((!$username) && (!$password) && (!$protocol)) { #use passwd table as default
if (defined($passwd_ent[0]->{username})) {
$username=$passwd_ent[0]->{username};
}
if (defined($passwd_ent[0]->{password})) {
$password = $passwd_ent[0]->{password};
}

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

@@ -643,7 +643,15 @@ noderes => {
descriptions => {
node => 'The node name or group name.',
servicenode => 'A comma separated list of node names (as known by the management node) that provides most services for this node. The first service node on the list that is accessible will be used. The 2nd node on the list is generally considered to be the backup service node for this node when running commands like snmove.',
netboot => 'The type of network booting to use for this node. Valid values: pxe or xnba for x86* architecture, yaboot for ppc64 RHEL 6 and SLES 11, grub2 for ppc64 RHEL7 and all the Little-Endian os deployment on PowerKVM guests, petitboot for the PowerNV deployment',
netboot => 'The type of network booting to use for this node. Valid values:
Arch OS valid netboot options
x86, x86_64 ALL pxe, xnba
ppc64 <=rhel6, <=sles11 yaboot
ppc64 >=rhels7 grub2,grub2-http,grub2-tftp
ppc64le NonVirtualize ALL petitboot
ppc64le PowerKVM Guest ALL grub2,grub2-http,grub2-tftp
',
tftpserver => 'The TFTP server for this node (as known by this node). If not set, it defaults to networks.tftpserver.',
tftpdir => 'The directory that roots this nodes contents from a tftp and related perspective. Used for NAS offload by using different mountpoints.',
nfsserver => 'The NFS or HTTP server for this node (as known by this node).',

2
xCAT-server/lib/xcat/plugins/destiny.pm
View File

@@ -226,7 +226,7 @@ sub setdestiny {
my $netbootval=xCAT::Utils->lookupNetboot($ref->{osvers},$ref->{osarch},$ref->{imagetype});
unless($netbootval =~ /$curnetboot/i){
$errored =1;
$callback->({errorcode=>[1],error=> [join(",",@{$req->{node}}).":stop configuration because $curnetboot DOES NOT work for provision of $target, please choose the correct noderes.netboot value in the subset \"$netbootval\",see description of 'netboot' attributes in 'tabdump -d noderes' for details."]});
$callback->({errorcode=>[1],error=> [join(",",@{$req->{node}}).": $curnetboot is not valid when provisioning $target,valid options: \"$netbootval\". \nFor more details see the 'netboot' description in the output of \"tabdump -d noderes\"."]});
return;
}

1
xCAT-server/lib/xcat/plugins/esx.pm
View File

@@ -2840,6 +2840,7 @@ sub setboot {
$running_tasks{$task}->{task} = $task;
$running_tasks{$task}->{callback} = \&generic_task_callback;
$running_tasks{$task}->{hyp} = $args{hyp};
$running_tasks{$task}->{vm} = $args{node};
$running_tasks{$task}->{data} = { node => $node, successtext => ${$args{exargs}}[0] };
}
sub register_vm {#Attempt to register existing instance of a VM

4
xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat
View File

@@ -13,7 +13,7 @@ check:rc==0
cmd:cat /etc/conserver.cf | grep $$CN
check:output=~$$CN
cmd:sleep 20
cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi
cmd:if [[ "__GETNODEATTR($$CN,arch)__" =~ "ppc64" ]]; then getmacs -D $$CN; fi
check:rc==0
cmd:makedhcp -n
check:rc==0
@@ -25,7 +25,7 @@ check:output=~$$CN
cmd:copycds $$ISO
check:rc==0
cmd:if cat /etc/*release |grep "7.0" |grep "Red Hat">/dev/null;then mkdef $$STATELITE -u profile=compute provmethod=statelite osvers=rhels7;else mkdef $$STATELITE -u profile=compute provmethod=statelite; fi
cmd:nodeset $$CN osimage=__GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-install-compute
check:rc==0
cmd:lsdef $$CN |grep provmethod