From 6703934d37e3adc17d7f922cc15254551a14049a Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 4 Jan 2010 17:44:48 +0000
Subject: [PATCH] do not update xcatmaster attribute

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4882 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/share/xcat/tools/csm2xcat | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/xCAT-server/share/xcat/tools/csm2xcat b/xCAT-server/share/xcat/tools/csm2xcat
index 964e55bf0..fc7a55c09 100755
--- a/xCAT-server/share/xcat/tools/csm2xcat
+++ b/xCAT-server/share/xcat/tools/csm2xcat
@@ -280,18 +280,20 @@ sub getNodeinfo
 
                 }
             }
-            if ($attr eq "ManagementServer")
-            {
+            # since we are suggesting that the xCAT MN is a different machine
+            # than the CSM MS,  we will not use the Management Server value
+            #if ($attr eq "ManagementServer")
+            #{
 
-                my $installserver = $attrhash{"InstallServer"};
-                if ($installserver eq "")    # if no install server, use MN
-                {
-                    if ($value)
-                    {
-                        $xcatline = "    xcatmaster=$value\n";
-                    }
-                }
-            }
+            #   my $installserver = $attrhash{"InstallServer"};
+            #    if ($installserver eq "")    # if no install server, use MN
+            #    {
+            #        if ($value)
+            #        {
+            #            $xcatline = "    xcatmaster=$value\n";
+            #        }
+            #    }
+            #}
             if ($attr eq "InstallOSName")
             {
                 if ($value)