From ef136c7f91d9d621b82d16ca047e1648bcf17df0 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 29 Mar 2017 16:31:55 -0400 Subject: [PATCH] Fix incorrect switch table handling A different program flow is required to deal with the oddity of the switch table --- xCAT-server/lib/xcat/plugins/confluent.pm | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/confluent.pm b/xCAT-server/lib/xcat/plugins/confluent.pm index 5fee08949..9275d9569 100644 --- a/xCAT-server/lib/xcat/plugins/confluent.pm +++ b/xCAT-server/lib/xcat/plugins/confluent.pm @@ -302,10 +302,15 @@ sub makeconfluentcfg { } } foreach my $nent (@cfgents4) { - foreach (keys %$nent) { - $cfgenthash{ $nent->{node} }->{$_} = $nent->{$_}; + foreach my $node (keys %$nent) { + foreach (@{$nent->{$node}}) { + foreach my $key (keys %$_) { + $cfgenthash{ $node }->{$key} = $_->{$key}; + } + } } } + my @cfgents = (); foreach (values %cfgenthash) { push @cfgents, $_;