xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-13 09:50:19 +00:00
Code Issues Releases Wiki Activity

Merge pull request #497 from xuweibj/S69370

Browse Source 
Add FQDNfirst option in global cfg.
This commit is contained in:
chenglch
2015-12-16 17:07:16 +08:00
parent 0495555413 3684705279
commit 88b61bab04
5 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docs/source/guides/admin-guides/references/man5/site.5.rst
View File

@ -369,7 +369,15 @@ site Attributes:
This setting does not apply to the service node. For sn
you need to set servicenode.ftpserver=1 if you want xcatd to
bring up vsftpd.
FQDNfirst: Fully Qualified Domain Name first. If set to 1/yes/enable, the /etc/hosts
entries generated by 'makehosts' will put the FQDN before the PQDN(Partially
Qualified Domain Name). Otherwise, the original behavior will be performed.
.. code-block:: perl
-----------------------
VIRTUALIZATION ATTRIBUTES
-----------------------

5
docs/source/guides/admin-guides/references/man8/makehosts.8.rst
View File

@ -58,8 +58,9 @@ OPTIONS
\ **-l**\ |\ **--longnamefirst**\
The long name of the host will appear before the short name for each host in the /etc/hosts file.
The default is short name first.
The FQDN (Fully Qualified Domain Name) of the host will appear before the PQDN (Partially Qualified Domain Name) for each host in the /etc/hosts file.
The default is PQDN first.
After xCAT is installed, the attribute name "FQDNfirst" can be added into "site" table manually. If the value is set as "1", "yes" or "enable", the /etc/hosts entries generated by "makehosts" will put the FQDN before the PQDN. Otherwise, the original behavior will be performed.

3
perl-xCAT/xCAT/Schema.pm
View File

@ -1174,6 +1174,9 @@ site => {
" This setting does not apply to the service node. For sn\n".
" you need to set servicenode.ftpserver=1 if you want xcatd to\n".
" bring up vsftpd.\n\n".
"FQDNfirst: Fully Qualified Domain Name first. If set to 1/yes/enable, the /etc/hosts \n".
" entries generated by 'makehosts' will put the FQDN before the PQDN(Partially \n".
" Qualified Domain Name). Otherwise, the original behavior will be performed.\n\n".
" -----------------------\n".
"VIRTUALIZATION ATTRIBUTES\n".
" -----------------------\n".

5
xCAT-client/pods/man8/makehosts.8.pod
View File

@ -34,8 +34,9 @@ it will only replace the lines in the file that correspond to the nodes in the s
=item B<-l>|B<--longnamefirst>
The long name of the host will appear before the short name for each host in the /etc/hosts file.
The default is short name first.
The FQDN (Fully Qualified Domain Name) of the host will appear before the PQDN (Partially Qualified Domain Name) for each host in the /etc/hosts file.
The default is PQDN first.
After xCAT is installed, the attribute name "FQDNfirst" can be added into "site" table manually. If the value is set as "1", "yes" or "enable", the /etc/hosts entries generated by "makehosts" will put the FQDN before the PQDN. Otherwise, the original behavior will be performed.
=item B<-m>|B<--mactolinklocal>

13
xCAT-server/lib/xcat/plugins/hosts.pm
View File

@ -394,13 +394,14 @@ sub process_request
return;
}
# get site FQDNfirst(Fully Qualified Domian Name)
my @FQDNfirst = xCAT::TableUtils->get_site_attribute("FQDNfirst");
if ( (defined($FQDNfirst[0])) && ( $FQDNfirst[0] =~ /^(1|yes|enable)$/i)) { $LONGNAME = "1"; }
# get site domain for backward compatibility
my $sitetab = xCAT::Table->new('site');
if ($sitetab) {
my $dom = $sitetab->getAttribs({key=>'domain'},'value');
if ($dom and $dom->{value}) {
$::sitedomain=$dom->{value};
}
my @domain = xCAT::TableUtils->get_site_attribute("domain");
if ($domain[0]) {
$::sitedomain=$domain[0];
}
my $hoststab = xCAT::Table->new('hosts');