2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00

Fix litefile entries for osimages with groups

Before this change, any `osimage` with the `groups` parameter defined to anything but `ALL` would not get entries set for `ALL` in the `litefile` table.

The only special case for images with `groups` should be the group-specific entries.
This commit is contained in:
adorsey-NOAA 2021-11-09 12:00:35 -05:00 committed by GitHub
parent 56bc6dd920
commit 0e37f52c41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -344,25 +344,20 @@ sub getNodeData {
my $imagegroups = $osimagetab->getAttribs({ imagename => $image }, @imagegroupsattr);
if ($imagegroups and $imagegroups->{groups}) {
# get the directories with no names
push @imageInfo, $tab->getAttribs({ image => '' }, @attrs);
# get for the image groups specific directories
push @imageInfo, $tab->getAttribs({ image => $imagegroups->{groups} }, @attrs);
# get for the image specific directories
push @imageInfo, $tab->getAttribs({ image => $image }, @attrs);
} else {
# get the directories with no names
push @imageInfo, $tab->getAttribs({ image => '' }, @attrs);
# get the ALL directories
push @imageInfo, $tab->getAttribs({ image => 'ALL' }, @attrs);
# get for the image specific directories
push @imageInfo, $tab->getAttribs({ image => $image }, @attrs);
}
# These cases should run for all images
# get the directories with no names
push @imageInfo, $tab->getAttribs({ image => '' }, @attrs);
# get the ALL directories
push @imageInfo, $tab->getAttribs({ image => 'ALL' }, @attrs);
# get for the image specific directories
push @imageInfo, $tab->getAttribs({ image => $image }, @attrs);
}
# pass back a reference to the directory