Merge pull request #4227 from xcat2/master

Merge master to 2.13 branch for 2.13.8 release(2)
xcat2 · Nov 2, 2017 · fe7405f · fe7405f
2 parents 0a25883 + 654ba50
commit fe7405f
Show file tree

Hide file tree

Showing 10 changed files with 239 additions and 115 deletions.
diff --git a/docs/source/advanced/hierarchy/provision/diskful_sn.rst b/docs/source/advanced/hierarchy/provision/diskful_sn.rst
@@ -33,22 +33,22 @@ Configure ``otherpkgdir`` and ``otherpkglist`` for service node osimage
 
  * Verify the following entries are included in the package file specified by the ``otherpkglist`` attribute of the service node osimage. ::
 
-    xcat/xcat-dep/<os>/<arch>/xCATsn
+    xcat/xcat-core/xCATsn
     xcat/xcat-dep/<os>/<arch>/conserver-xcat
     xcat/xcat-dep/<os>/<arch>/perl-Net-Telnet
     xcat/xcat-dep/<os>/<arch>/perl-Expect
 
    For example, for the osimage *rhels7-x86_64-install-service* ::
 
-    [root@fs4 ~]# lsdef -t osimage rhels7-x86_64-install-service -i otherpkglist
-       Object name: rhels7-x86_64-install-service
+    lsdef -t osimage rhels7-x86_64-install-service -i otherpkglist
+    Object name: rhels7-x86_64-install-service
          otherpkglist=/opt/xcat/share/xcat/install/rh/service.rhels7.x86_64.otherpkgs.pkglist
-    [root@fs4 ~]# cat /opt/xcat/share/xcat/install/rh/service.rhels7.x86_64.otherpkgs.pkglist
+
+    cat /opt/xcat/share/xcat/install/rh/service.rhels7.x86_64.otherpkgs.pkglist
        xcat/xcat-core/xCATsn
        xcat/xcat-dep/rh7/x86_64/conserver-xcat
        xcat/xcat-dep/rh7/x86_64/perl-Net-Telnet
        xcat/xcat-dep/rh7/x86_64/perl-Expect
-    [root@fs4 ~]#
 
 **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.
 

diff --git a/docs/source/advanced/hierarchy/provision/diskless_sn.rst b/docs/source/advanced/hierarchy/provision/diskless_sn.rst
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -59,7 +59,7 @@
 # The short X.Y version.
 version = '2'
 # The full version, including alpha/beta/rc tags.
-release = '2.13.6'
+release = '2.13.8'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/...urce/guides/admin-guides/manage_clusters/common/deployment/enable_localdisk.rst b/...urce/guides/admin-guides/manage_clusters/common/deployment/enable_localdisk.rst
@@ -1,3 +1,5 @@
+.. _setup_localdisk_label:
+
 Enabling the localdisk Option
 -----------------------------
 
@@ -80,6 +82,6 @@ For the files/directories that you would like xCAT to store on the local disk, a
 
 ``Note``: you do not need to specify the swap space in the litefile table. Just putting it in the partitionfile config file is enough.
 
-Add an entry in policy table to permit the running of the ``getpartitioin`` command from the node ::
+Add an entry in policy table to permit the running of the ``getpartition`` command from the node ::
 
     chtab priority=7.1 policy.commands=getpartition policy.rule=allow
diff --git a/...des/admin-guides/manage_clusters/ppc64le/diskless/customize_image/localdisk.rst b/...des/admin-guides/manage_clusters/ppc64le/diskless/customize_image/localdisk.rst
@@ -1 +1,4 @@
 .. include:: ../../../common/deployment/enable_localdisk.rst
+
+``Note``:
+    * 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.
diff --git a/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/localdisk.rst b/docs/source/guides/admin-guides/manage_clusters/ppc64le/diskless/localdisk.rst
diff --git a/docs/source/overview/xcat2_release.rst b/docs/source/overview/xcat2_release.rst
@@ -14,6 +14,16 @@ xCAT 2.13.x
 |xCAT                             |New OS         |New          |New Feature                       |
 |Version                          |               |Hardware     |                                  |
 +=================================+===============+=============+==================================+
+|| xCAT 2.13.8                    |               |             |- OpenBMC support:                |
+|| 2017/11/3                      |               |             |                                  |
+||                                |               |             |  rflash/rpower run parallelly    |
+| `2.13.8 Release Notes <https:// |               |             |                                  |
+| github.com/xcat2/xcat-core/wiki |               |             |  rspconfig sshcfg run parallelly |
+| /XCAT_2.13.8_Release_Notes>`_   |               |             |                                  |
+|                                 |               |             |- The document of MN HA           |
+|                                 |               |             |                                  |
+|                                 |               |             |- nodeset enhance for multi-nodes |
++---------------------------------+---------------+-------------+----------------------------------+
 || xCAT 2.13.7                    |               |             |- OpenBMC support:                |
 || 2017/9/22                      |               |             |                                  |
 ||                                |               |             |  rflash for OpenBMC and PNOR     |

diff --git a/perl-xCAT/xCAT/MacMap.pm b/perl-xCAT/xCAT/MacMap.pm
@@ -512,7 +512,7 @@ sub refresh_table {
         my $ntype = $typehash->{$entry->{node}}->[0]->{nodetype};
         if ( (($discover_switch) and ( $ntype ne "switch"))
             or ( !($discover_switch) and ( $ntype eq "switch")) ){
-            xCAT::MsgUtils->message("S", "refresh_table: skip $entry->{node} and $entry->{switch}, $discover_switch , $ntype\n");
+            xCAT::MsgUtils->trace(0, "d", "refresh_table: skip node=$entry->{node} switch=$entry->{switch} discover_switch=$discover_switch nodetype=$ntype\n");
             next;
         }
         if (defined($entry->{switch}) and $entry->{switch} ne "" and defined($entry->{port}) and $entry->{port} ne "") {
@@ -561,7 +561,7 @@ sub refresh_table {
             $self->refresh_switch($parent, $community, $entry->{switch});
             my $runstop = time;
             my $diffduration = $runstop - $runstart;
-            xCAT::MsgUtils->message("S", "refresh_switch $entry->{switch} ElapsedTime:$diffduration sec");
+            xCAT::MsgUtils->trace(0, ($diffduration > 10) ? "w" : "d", "refresh_switch $entry->{switch} ElapsedTime:$diffduration sec");
             exit(0);
         }
         close($parent);
@@ -612,9 +612,9 @@ sub walkoid {
     if ($session->{ErrorStr}) {
         unless ($namedargs{silentfail}) {
             if ($namedargs{ciscowarn}) {
-                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});
+                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});
             } else {
-                xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": " . $session->{ErrorStr});
+                xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": " . $session->{ErrorStr});
             }
         }
         if ($switch) {
@@ -760,6 +760,7 @@ sub refresh_switch {
                             printf $output "$mymac|%s\n", $self->{switches}->{$switch}->{$myport};
                         }
                     }
+                    $macport="swp".$macport;
                     push @{ $index_to_vlan{$macport} }, $macvlan;
                     push @{ $index_to_mac{$macport} }, $mymac;
                 }
@@ -832,23 +833,23 @@ sub refresh_switch {
     if ($self->{switchparmhash}->{$switch}->{switchtype} eq 'onie'){
         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
         if (not ref $bridgetoifmap or !keys %{$bridgetoifmap}) {
-            xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
+            xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
             $self->{macinfo}->{$switch}->{ErrorStr} = "Failed to get a valid response to BRIDGE-MIB request";
             return;
         }
         foreach my $boid (keys %$bridgetoifmap) {
             my $port_index = $boid;
             my $port_name  = $namemap->{ $bridgetoifmap->{$port_index} };
             my $mtu  = $iftomtumap->{ $bridgetoifmap->{$port_index} };
-            if (defined($index_to_mac{$port_index})) {
-                push @{ $self->{macinfo}->{$switch}->{$port_name} }, @{ $index_to_mac{$port_index} };
+            if (defined($index_to_mac{$port_name})) {
+                push @{ $self->{macinfo}->{$switch}->{$port_name} }, @{ $index_to_mac{$port_name} };
             }
             else {
                 $self->{macinfo}->{$switch}->{$port_name}->[0] = '';
             }
 
-            if (defined($index_to_vlan{$port_index})) {
-                push @{ $self->{vlaninfo}->{$switch}->{$port_name} }, @{ $index_to_vlan{$port_index} };
+            if (defined($index_to_vlan{$port_name})) {
+                push @{ $self->{vlaninfo}->{$switch}->{$port_name} }, @{ $index_to_vlan{$port_name} };
             }
             else {
                 $self->{vlaninfo}->{$switch}->{$port_name}->[0] = '';
@@ -915,7 +916,7 @@ sub refresh_switch {
         }
         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
         if (not ref $bridgetoifmap or !keys %{$bridgetoifmap}) {
-            xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
+            xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": failed to get a valid response to BRIDGE-MIB request");
             if ($self->{collect_mac_info}) {
                 $self->{macinfo}->{$switch}->{ErrorStr} = "Failed to get a valid response to BRIDGE-MIB request";
             }
@@ -928,7 +929,7 @@ sub refresh_switch {
             $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});
         }    #Ok, time to process the data
         if (not ref $mactoindexmap or !keys %{$mactoindexmap}) {
-            xCAT::MsgUtils->message("S", "Error communicating with " . $session->{DestHost} . ": Unable to get MAC entries via either BRIDGE or Q-BRIDE MIB");
+            xCAT::MsgUtils->message("S", "Error communicating with switch " . $session->{DestHost} . ": Unable to get MAC entries via either BRIDGE or Q-BRIDE MIB");
             if ($self->{collect_mac_info}) {
                 $self->{macinfo}->{$switch}->{ErrorStr} = "Unable to get MAC entries via either BRIDGE or Q-BRIDE MIB";
             }

diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm
@@ -692,8 +692,6 @@ sub scan_process {
                         }
                     }
                 }
-                bmcdiscovery_openbmc(${$live_ip}[$i], $opz, $opw, $request_command) unless ($flag);
-
                 close($parent_fd);
                 exit 0;
             } else {

diff --git a/xCAT-server/lib/xcat/plugins/getpartition.pm b/xCAT-server/lib/xcat/plugins/getpartition.pm
@@ -3,7 +3,7 @@
 
 =head1
   xCAT plugin package to handle getpartition command
-  Generally, the getpartitioin command is called from the stateless 
+  Generally, the getpartition command is called from the stateless
     node during the booting period to get the partition configureation
     infomation to part the hard disk on the stateless node and to 
     manage the local disk space for statelite and swap space.
-Original file line number
+Diff line change
@@ Expand Up / @@ -692,8 +692,6 @@ sub scan_process { @@
                             }
                         }
                     }
-                    bmcdiscovery_openbmc(${$live_ip}[$i], $opz, $opw, $request_command) unless ($flag);
                     close($parent_fd);
                     exit 0;
                 } else {
@@ Expand Down @@