xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-23 06:25:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2766 from immarvin/onissue

Browse Source 
fix issue rinstall is not able to set or detect the arch , does not happen with nodeset #2745
This commit is contained in:
zet809
2017-03-29 13:34:30 +08:00
committed by GitHub
parent 36e11d1a90 0efb6aa83f
commit b07d6d3116
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
xCAT-server/lib/xcat/plugins/rinstall.pm
View File

@ -218,9 +218,9 @@ sub rinstall {
}
my $nodetypearch = $nodetypeattribs->{'arch'};
if ($nodetypearch ne $osimagearch) {
unless ((($nodetypearch =~ /ppc64le/) or ($nodetypearch =~ /ppc64el/)) and (($osimagearch =~ /ppc64le/) or ($osimagearch =~ /ppc64el/))) {
unless(($nodetypearch =~ /^ppc64(le|el)?$/i) and ($osimagearch =~ /^ppc64(le|el)?$/i)){
my $rsp = {};
$rsp->{error}->[0] = "$node: The value of 'arch' attribute is not same as the 'osarch' attribute for osimage.";
$rsp->{error}->[0] = "$node: The value of 'arch' attribute of node does not match the 'osarch' attribute of osimage.";
$rsp->{errorcode}->[0] = 1;
xCAT::MsgUtils->message("E", $rsp, $callback);
next;