From 5de893e1be42e7faff1d18f38376ebe48ca77870 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 3 Apr 2008 17:57:15 +0000
Subject: [PATCH] Add all group to the definition of rr nodes

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@973 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client-2.0/pods/man8/mkrrnodes.8.pod  | 34 ++++------------------
 xCAT-server-2.0/share/xcat/tools/mkrrnodes |  8 ++---
 2 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/xCAT-client-2.0/pods/man8/mkrrnodes.8.pod b/xCAT-client-2.0/pods/man8/mkrrnodes.8.pod
index 70ca3edbc..04c2f060c 100644
--- a/xCAT-client-2.0/pods/man8/mkrrnodes.8.pod
+++ b/xCAT-client-2.0/pods/man8/mkrrnodes.8.pod
@@ -1,11 +1,11 @@
 =head1 NAME
 
-B<mkrrnodes> - Sample tool for adding or deleting many nodes in the xCAT cluster database.
+B<mkrrnodes> - Adds or deletes nodes in the xCAT cluster database.
 
 
 =head1 SYNOPSIS
 
-B<mkrrnodes> [B<-d> ]| [B<-C> I<a|b|,...,r>]  B<-R> I<startrange,endrange>
+B<mkrrnodes> [-d ]| [-C a|b|,...,r]  -R [startrange,endrange]
 
 
 B<mkrrnodes> [B<-h> | B<--help>]
@@ -13,37 +13,13 @@ B<mkrrnodes> [B<-h> | B<--help>]
 
 =head1 DESCRIPTION
 
-The B<mkrrnodes> command is a sample tool that adds or deletes (-d) nodes according to a specific
-naming convention.  You can input the connected unit name (CU, a subset of the cluster, usually in its own
-subnet and managed by an xCAT service node) using the -C flag, and you can input the start and end
-range using the -R flag. It will also automatically define required nodegroups.
-
-In this example tool, the node names will have the format:
-
-B<rr>I<x048y>
-
-where:
- x is a-z, indicating the CU name
- 048 is the node number within that CU
- y is a-c, indicating which of 3 blades within the "triblade" group it is
+The mkrrnodes add or delete (-d) the nodes requested by inputting the CU name (-C) flag and the start and end range (-R) flag.  It will also automatically define required nodegroups. 
 
 =head1 OPTIONS
 
 
 =over 10
 
-=item B<-C> I<char>
-
-A single letter designating which CU (connected unit).
-
-=item B<-R> I<start,end>
-
-The numeric start and end of the range of nodes to create.
-
-=item B<-d>
-
-Delete the nodes instead of adding them.
-
 =item B<-h|--help>
 
 Display usage message.
@@ -72,11 +48,11 @@ An error has occurred.
 
 =item *
 
-To build a nodelist entry like this "rrb048c","rrb048,qs22,cub,cell,cell-c,compute,tb,rack06",,,,:
+To build a nodelist entry like this "rrb048c","rrb048,qs22,cub,cell,cell-c,compute,tb,all,rack06",,,,:
 
 B<mkrrnodes> -C b -R 048,048
 
-To delete a nodelist entry like this "rrb048c","rrb048,qs22,cub,cell,cell-c,compute,tb,rack06",,,,:
+To delete a nodelist entry like this "rrb048c","rrb048,qs22,cub,cell,cell-c,compute,tb,all,rack06",,,,:
 
 B<mkrrnodes> -d -C b -R 048,048
 
diff --git a/xCAT-server-2.0/share/xcat/tools/mkrrnodes b/xCAT-server-2.0/share/xcat/tools/mkrrnodes
index ef742fade..65704d8e6 100644
--- a/xCAT-server-2.0/share/xcat/tools/mkrrnodes
+++ b/xCAT-server-2.0/share/xcat/tools/mkrrnodes
@@ -16,7 +16,7 @@ use Getopt::Long;
  mkrrnodes -d -C <cu letter> -R <startrange,endrange> (delete)
  Build an nodelist entry that looks like this
 
- "rrb048c","rrb048,qs22,cub,cell,cell-c,compute,tb,rack06",,,,
+ "rrb048c","rrb048,qs22,cub,cell,cell-c,compute,tb,all,rack06",,,,
 
 
 =cut
@@ -43,12 +43,12 @@ foreach my $CU (@::CU)
             $cmd .= " ";
             if ($blade eq "a" ) {
               
-              $cmd .= "groups=rr$CU$range,ls21,cu$CU,opteron,compute,tb";
+              $cmd .= "groups=rr$CU$range,ls21,cu$CU,opteron,compute,tb,all";
             } else {
               if ($blade eq "b" ) {
-              $cmd .= "groups=rr$CU$range,qs22,cu$CU,cell,cell-b,compute,tb";
+              $cmd .= "groups=rr$CU$range,qs22,cu$CU,cell,cell-b,compute,all,tb";
                } else { # c
-              $cmd .= "groups=rr$CU$range,qs22,cu$CU,cell,cell-c,compute,tb";
+              $cmd .= "groups=rr$CU$range,qs22,cu$CU,cell,cell-c,compute,all,tb";
                
               }
             }