Skip to content

Commit fe7405f

Browse files
author
zet809
authored
Merge pull request #4227 from xcat2/master
Merge master to 2.13 branch for 2.13.8 release(2)
2 parents 0a25883 + 654ba50 commit fe7405f

File tree

10 files changed

+239
-115
lines changed

10 files changed

+239
-115
lines changed

‎docs/source/advanced/hierarchy/provision/diskful_sn.rst‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,22 @@ Configure ``otherpkgdir`` and ``otherpkglist`` for service node osimage
3333

3434
* Verify the following entries are included in the package file specified by the ``otherpkglist`` attribute of the service node osimage. ::
3535

36-
xcat/xcat-dep/<os>/<arch>/xCATsn
36+
xcat/xcat-core/xCATsn
3737
xcat/xcat-dep/<os>/<arch>/conserver-xcat
3838
xcat/xcat-dep/<os>/<arch>/perl-Net-Telnet
3939
xcat/xcat-dep/<os>/<arch>/perl-Expect
4040

4141
For example, for the osimage *rhels7-x86_64-install-service* ::
4242

43-
[root@fs4 ~]# lsdef -t osimage rhels7-x86_64-install-service -i otherpkglist
44-
Object name: rhels7-x86_64-install-service
43+
lsdef -t osimage rhels7-x86_64-install-service -i otherpkglist
44+
Object name: rhels7-x86_64-install-service
4545
otherpkglist=/opt/xcat/share/xcat/install/rh/service.rhels7.x86_64.otherpkgs.pkglist
46-
[root@fs4 ~]# cat /opt/xcat/share/xcat/install/rh/service.rhels7.x86_64.otherpkgs.pkglist
46+
47+
cat /opt/xcat/share/xcat/install/rh/service.rhels7.x86_64.otherpkgs.pkglist
4748
xcat/xcat-core/xCATsn
4849
xcat/xcat-dep/rh7/x86_64/conserver-xcat
4950
xcat/xcat-dep/rh7/x86_64/perl-Net-Telnet
5051
xcat/xcat-dep/rh7/x86_64/perl-Expect
51-
[root@fs4 ~]#
5252

5353
**Note:** you will be installing the xCAT Service Node rpm xCATsn meta-package on the Service Node, not the xCAT Management Node meta-package. Do not install both.
5454

‎docs/source/advanced/hierarchy/provision/diskless_sn.rst‎

Lines changed: 204 additions & 88 deletions
Large diffs are not rendered by default.

‎docs/source/conf.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
# The short X.Y version.
6060
version = '2'
6161
# The full version, including alpha/beta/rc tags.
62-
release = '2.13.6'
62+
release = '2.13.8'
6363

6464
# The language for content autogenerated by Sphinx. Refer to documentation
6565
# for a list of supported languages.

‎docs/source/guides/admin-guides/manage_clusters/common/deployment/enable_localdisk.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _setup_localdisk_label:
2+
13
Enabling the localdisk Option
24
-----------------------------
35

@@ -80,6 +82,6 @@ For the files/directories that you would like xCAT to store on the local disk, a
8082

8183
``Note``: you do not need to specify the swap space in the litefile table. Just putting it in the partitionfile config file is enough.
8284

83-
Add an entry in policy table to permit the running of the ``getpartitioin`` command from the node ::
85+
Add an entry in policy table to permit the running of the ``getpartition`` command from the node ::
8486

8587
chtab priority=7.1 policy.commands=getpartition policy.rule=allow

‎docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/customize_image/localdisk.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
11
.. include:: ../../../common/deployment/enable_localdisk.rst
2+
3+
``Note``:
4+
* To keep the contents on local disk after you using ``enablepart=yes`` to do the disk partitioning, make sure to set ``enablepart=no`` in partition configuration file after the node is booted.

‎docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/localdisk.rst‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎docs/source/overview/xcat2_release.rst‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@ xCAT 2.13.x
1414
|xCAT |New OS |New |New Feature |
1515
|Version | |Hardware | |
1616
+=================================+===============+=============+==================================+
17+
|| xCAT 2.13.8 | | |- OpenBMC support: |
18+
|| 2017/11/3 | | | |
19+
|| | | | rflash/rpower run parallelly |
20+
| `2.13.8 Release Notes <https:// | | | |
21+
| github.com/xcat2/xcat-core/wiki | | | rspconfig sshcfg run parallelly |
22+
| /XCAT_2.13.8_Release_Notes>`_ | | | |
23+
| | | |- The document of MN HA |
24+
| | | | |
25+
| | | |- nodeset enhance for multi-nodes |
26+
+---------------------------------+---------------+-------------+----------------------------------+
1727
|| xCAT 2.13.7 | | |- OpenBMC support: |
1828
|| 2017/9/22 | | | |
1929
|| | | | rflash for OpenBMC and PNOR |

‎perl-xCAT/xCAT/MacMap.pm‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ sub refresh_table {
512512
my $ntype = $typehash->{$entry->{node}}->[0]->{nodetype};
513513
if ( (($discover_switch) and ( $ntype ne "switch"))
514514
or ( !($discover_switch) and ( $ntype eq "switch")) ){
515-
xCAT::MsgUtils->message("S", "refresh_table: skip $entry->{node} and $entry->{switch}, $discover_switch , $ntype\n");
515+
xCAT::MsgUtils->trace(0, "d", "refresh_table: skip node=$entry->{node} switch=$entry->{switch} discover_switch=$discover_switch nodetype=$ntype\n");
516516
next;
517517
}
518518
if (defined($entry->{switch}) and $entry->{switch} ne "" and defined($entry->{port}) and $entry->{port} ne "") {
@@ -561,7 +561,7 @@ sub refresh_table {
561561
$self->refresh_switch($parent, $community, $entry->{switch});
562562
my $runstop = time;
563563
my $diffduration = $runstop - $runstart;
564-
xCAT::MsgUtils->message("S", "refresh_switch $entry->{switch} ElapsedTime:$diffduration sec");
564+
xCAT::MsgUtils->trace(0, ($diffduration > 10) ? "w" : "d", "refresh_switch $entry->{switch} ElapsedTime:$diffduration sec");
565565
exit(0);
566566
}
567567
close($parent);
@@ -612,9 +612,9 @@ sub walkoid {
612612
if ($session->{ErrorStr}) {
613613
unless ($namedargs{silentfail}) {
614614
if ($namedargs{ciscowarn}) {
615-
xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . " (First attempt at indexing by VLAN failed, ensure that the switch has the vlan configured such that it appears in 'show vlan'): " . $session->{ErrorStr});
615+
xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . " (First attempt at indexing by VLAN failed, ensure that the switch has the vlan configured such that it appears in 'show vlan'): " . $session->{ErrorStr});
616616
} else {
617-
xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": " . $session->{ErrorStr});
617+
xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": " . $session->{ErrorStr});
618618
}
619619
}
620620
if ($switch) {
@@ -760,6 +760,7 @@ sub refresh_switch {
760760
printf $output "$mymac|%s\n", $self->{switches}->{$switch}->{$myport};
761761
}
762762
}
763+
$macport="swp".$macport;
763764
push @{ $index_to_vlan{$macport} }, $macvlan;
764765
push @{ $index_to_mac{$macport} }, $mymac;
765766
}
@@ -832,23 +833,23 @@ sub refresh_switch {
832833
if ($self->{switchparmhash}->{$switch}->{switchtype} eq 'onie'){
833834
my $bridgetoifmap = walkoid($session, '.1.3.6.1.2.1.17.1.4.1.2', ciscowarn => $iscisco, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback}); # Good for all switches
834835
if (not ref $bridgetoifmap or !keys %{$bridgetoifmap}) {
835-
xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
836+
xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
836837
$self->{macinfo}->{$switch}->{ErrorStr} = "Failed to get a valid response to BRIDGE-MIB request";
837838
return;
838839
}
839840
foreach my $boid (keys %$bridgetoifmap) {
840841
my $port_index = $boid;
841842
my $port_name = $namemap->{ $bridgetoifmap->{$port_index} };
842843
my $mtu = $iftomtumap->{ $bridgetoifmap->{$port_index} };
843-
if (defined($index_to_mac{$port_index})) {
844-
push @{ $self->{macinfo}->{$switch}->{$port_name} }, @{ $index_to_mac{$port_index} };
844+
if (defined($index_to_mac{$port_name})) {
845+
push @{ $self->{macinfo}->{$switch}->{$port_name} }, @{ $index_to_mac{$port_name} };
845846
}
846847
else {
847848
$self->{macinfo}->{$switch}->{$port_name}->[0] = '';
848849
}
849850

850-
if (defined($index_to_vlan{$port_index})) {
851-
push @{ $self->{vlaninfo}->{$switch}->{$port_name} }, @{ $index_to_vlan{$port_index} };
851+
if (defined($index_to_vlan{$port_name})) {
852+
push @{ $self->{vlaninfo}->{$switch}->{$port_name} }, @{ $index_to_vlan{$port_name} };
852853
}
853854
else {
854855
$self->{vlaninfo}->{$switch}->{$port_name}->[0] = '';
@@ -915,7 +916,7 @@ sub refresh_switch {
915916
}
916917
my $bridgetoifmap = walkoid($session, '.1.3.6.1.2.1.17.1.4.1.2', ciscowarn => $iscisco, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback}); # Good for all switches
917918
if (not ref $bridgetoifmap or !keys %{$bridgetoifmap}) {
918-
xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
919+
xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
919920
if ($self->{collect_mac_info}) {
920921
$self->{macinfo}->{$switch}->{ErrorStr} = "Failed to get a valid response to BRIDGE-MIB request";
921922
}
@@ -928,7 +929,7 @@ sub refresh_switch {
928929
$mactoindexmap = walkoid($session, '.1.3.6.1.2.1.17.4.3.1.2', ciscowarn => $iscisco, verbose => $self->{show_verbose_info}, switch => $switch, callback => $self->{callback});
929930
} #Ok, time to process the data
930931
if (not ref $mactoindexmap or !keys %{$mactoindexmap}) {
931-
xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": Unable to get MAC entries via either BRIDGE or Q-BRIDE MIB");
932+
xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": Unable to get MAC entries via either BRIDGE or Q-BRIDE MIB");
932933
if ($self->{collect_mac_info}) {
933934
$self->{macinfo}->{$switch}->{ErrorStr} = "Unable to get MAC entries via either BRIDGE or Q-BRIDE MIB";
934935
}

‎xCAT-server/lib/xcat/plugins/bmcdiscover.pm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -692,8 +692,6 @@ sub scan_process {
692692
}
693693
}
694694
}
695-
bmcdiscovery_openbmc(${$live_ip}[$i], $opz, $opw, $request_command) unless ($flag);
696-
697695
close($parent_fd);
698696
exit 0;
699697
} else {

‎xCAT-server/lib/xcat/plugins/getpartition.pm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
=head1
55
xCAT plugin package to handle getpartition command
6-
Generally, the getpartitioin command is called from the stateless
6+
Generally, the getpartition command is called from the stateless
77
node during the booting period to get the partition configureation
88
infomation to part the hard disk on the stateless node and to
99
manage the local disk space for statelite and swap space.

0 commit comments

Comments
 (0)