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

Only display OK messages with -V option or if all compute nodes are OK

Browse Source
This commit is contained in:
Mark Gurevich
2016-07-14 10:38:39 -04:00
parent c487d612c4
commit 97de4408ba
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
xCAT-probe/subcmds/image
View File

@@ -131,7 +131,7 @@ foreach (@all_nodes_provmethod_lines) {
# Check if it is netboot, meaning diskless
if ($osimage_provmethod_type && $osimage_provmethod_type eq 'netboot') {
push(@diskless_nodes, $node_name);
probe_utils->send_msg("$output", "o", "$node_name is diskless");
probe_utils->send_msg("$output", "o", "$node_name is diskless") if ($VERBOSE);
if (length($rootimagedir) > 0) {
# For this diskless node, get UUID from rootimg directory xcatinfo file of the provmethod osimage
my $xcatinfo_file = $rootimagedir . "/rootimg/opt/xcat/xcatinfo";
@@ -181,7 +181,7 @@ foreach (@pping_lines) {
probe_utils->send_msg("$output", "f", "Pinging $hostname");
}
else {
probe_utils->send_msg("$output", "o", "Pinging $hostname");
probe_utils->send_msg("$output", "o", "Pinging $hostname") if ($VERBOSE);
push(@pingable_nodes, $hostname);
}
}
@@ -254,27 +254,31 @@ foreach (@xdsh_name_lines) {
# Probe verification step 1 - make sure all nodes are installed with the osimage name and imageUUID as defined on MN
if ($DEFINITION_CHECK) {
my $success_nodes = 0;
my $msg;
foreach (@pingable_nodes) {
my $msg;
my $status;
if (($node_running_image_name_hash{$_} eq $node_defined_image_name_hash{$_}) &&
($node_running_image_uuid_hash{$_} eq $node_defined_image_uuid_hash{$_})) {
if ($node_running_image_uuid_hash{$_} eq $na) {
$msg = "$_: Not able to determine installed os image name or uuid";
$status = "f";
}
else {
$msg = "OS image installed on compute node $_ matches the image defined for it on management node";
$status = "o";
$msg = "OS image installed on compute node $_ matches the image defined for it on management node";
probe_utils->send_msg("$output", "o", "$msg") if ($VERBOSE);
$success_nodes++;
next;
}
}
else {
$msg = "$_: Unmatched os image name or image UUID.\n Defined: name = $node_defined_image_name_hash{$_}" .
" uuid = $node_defined_image_uuid_hash{$_}\n Installed: name = $node_running_image_name_hash{$_}" .
" uuid = $node_running_image_uuid_hash{$_}";
$status = "f";
}
probe_utils->send_msg("$output", "$status", "$msg");
probe_utils->send_msg("$output", "f", "$msg");
}
if (scalar(@pingable_nodes) eq $success_nodes) {
# All pingable nodes were tested with success
probe_utils->send_msg("$output", "o", "OS image installed on each diskless compute node matches the image defined for it on management node");
}
}