From fb4e4a09e5b6af336cdd305104751c837f01ac9a Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Tue, 30 Oct 2012 23:39:06 +0000 Subject: [PATCH] In RHEV-M, we currently fail hard in the case where user did not set installnic/primarynic. In this scenario, instead of failing, just let firmware have a chance to fill it in git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@14168 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/rhevm.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/rhevm.pm b/xCAT-server/lib/xcat/plugins/rhevm.pm index 3715dfdcf..b73f659e2 100644 --- a/xCAT-server/lib/xcat/plugins/rhevm.pm +++ b/xCAT-server/lib/xcat/plugins/rhevm.pm @@ -592,17 +592,17 @@ sub mkinstall { } else { $ksdev = $ent->{primarynic}; } - } else { - my $rsp; - push @{$rsp->{data}}, "No network interface was set: installnic, primarynic"; - xCAT::MsgUtils->message("E", $rsp, $callback); } # set the storage parameters $kcmdline .= " storage_init"; # set the bootif - $kcmdline .= " BOOTIF=$ksdev ip=dhcp"; + if ($ksdev) { + $kcmdline .= " BOOTIF=$ksdev ip=dhcp"; + } else { #let boot firmware fill it in + $kcmdline .= " ip=dhcp"; + } # set the passwd for admin and root $kcmdline .= " adminpw=$rhevm_hash->{$rhevm}->{host}->{$node}->{adminpw} rootpw=$rhevm_hash->{$rhevm}->{host}->{$node}->{rootpw} ssh_pwauth=1";