xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-09-01 15:58:28 +00:00
Code Issues Releases Wiki Activity

Fix incorrect scoping of site variable handling

Browse Source
This commit is contained in:
Jarrod Johnson
2020-01-09 10:13:37 -05:00
parent b00354f41d
commit e9dc40717e
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@@ -1623,37 +1623,37 @@ sub process_request
}
}
}
@entries = xCAT::TableUtils->get_site_attribute("nameservers");
$t_entry = $entries[0];
if (defined($t_entry)) {
$sitenameservers = $t_entry;
}
@entries = xCAT::TableUtils->get_site_attribute("ntpservers");
$t_entry = $entries[0];
if (defined($t_entry)) {
$sitentpservers = $t_entry;
}
@entries = xCAT::TableUtils->get_site_attribute("logservers");
$t_entry = $entries[0];
if (defined($t_entry)) {
$sitelogservers = $t_entry;
}
@entries = xCAT::TableUtils->get_site_attribute("domain");
$t_entry = $entries[0];
unless (defined($t_entry))
{
# this may not be an error
# $callback->(
# {error => ["No domain defined in site tabe"], errorcode => [1]}
# );
# return;
} else {
$site_domain = $t_entry;
}
xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: sitelogservers=$sitelogservers sitentpservers=$sitentpservers sitenameservers=$sitenameservers site_domain=$site_domain");
}
@entries = xCAT::TableUtils->get_site_attribute("nameservers");
$t_entry = $entries[0];
if (defined($t_entry)) {
$sitenameservers = $t_entry;
}
@entries = xCAT::TableUtils->get_site_attribute("ntpservers");
$t_entry = $entries[0];
if (defined($t_entry)) {
$sitentpservers = $t_entry;
}
@entries = xCAT::TableUtils->get_site_attribute("logservers");
$t_entry = $entries[0];
if (defined($t_entry)) {
$sitelogservers = $t_entry;
}
@entries = xCAT::TableUtils->get_site_attribute("domain");
$t_entry = $entries[0];
unless (defined($t_entry))
{
# this may not be an error
# $callback->(
# {error => ["No domain defined in site tabe"], errorcode => [1]}
# );
# return;
} else {
$site_domain = $t_entry;
}
xCAT::MsgUtils->trace($verbose_on_off, "d", "dhcp: sitelogservers=$sitelogservers sitentpservers=$sitentpservers sitenameservers=$sitenameservers site_domain=$site_domain");
@dhcpconf = ();
@dhcp6conf = ();