From 55fc5d406411278cde0b1b13943e670ecffc724e Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 5 Jul 2013 02:17:44 +0000
Subject: [PATCH] modifiy the install chef server/client/workstation scripts
 and the mypostscript.tmpl to support the cfgmgt table

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16886 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/config_chef_client           | 6 +++++-
 xCAT/postscripts/config_chef_workstation      | 6 +++++-
 xCAT/postscripts/install_chef_client          | 6 +++++-
 xCAT/postscripts/install_chef_workstation     | 6 +++++-
 xCAT/templates/mypostscript/mypostscript.tmpl | 2 ++
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/xCAT/postscripts/config_chef_client b/xCAT/postscripts/config_chef_client
index fcf6a102f..d159f9043 100755
--- a/xCAT/postscripts/config_chef_client
+++ b/xCAT/postscripts/config_chef_client
@@ -20,7 +20,11 @@ if [ $ARGNUM -gt 1 ]; then
 fi
 
 if [ -z "$chef_server" ]; then
-    if [ -n "$CHEFSERVER" ]; then
+    if [ -n "$CFGSERVER" ]; then
+        chef_server=$CFGSERVER
+    fi
+    if [ -z "$chef_server" ]
+    then
         chef_server=$CHEFSERVER
     fi
     if [ -z "$chef_server" ]; then
diff --git a/xCAT/postscripts/config_chef_workstation b/xCAT/postscripts/config_chef_workstation
index 2763fec7c..c75b197d8 100755
--- a/xCAT/postscripts/config_chef_workstation
+++ b/xCAT/postscripts/config_chef_workstation
@@ -24,7 +24,11 @@ fi
 
 if [ -z "$chefserver" ]
 then
-    if [ -n "$CHEFSERVER" ]
+    if [ -n "$CFGSERVER" ]
+    then
+        chefserver=$CFGSERVER
+    fi
+    if [ -z "$chefserver" ]
     then
         chefserver=$CHEFSERVER
     fi
diff --git a/xCAT/postscripts/install_chef_client b/xCAT/postscripts/install_chef_client
index 337ff90fd..c340d77c0 100755
--- a/xCAT/postscripts/install_chef_client
+++ b/xCAT/postscripts/install_chef_client
@@ -52,7 +52,11 @@ fi
 
 if [ -z "$chefserver" ]
 then
-    if [ -n "$CHEFSERVER" ]
+    if [ -n "$CFGSERVER" ]
+    then
+        chefserver=$CFGSERVER
+    fi
+    if [ -z "$chefserver" ]
     then
         chefserver=$CHEFSERVER
     fi
diff --git a/xCAT/postscripts/install_chef_workstation b/xCAT/postscripts/install_chef_workstation
index 062692a77..1639610b1 100755
--- a/xCAT/postscripts/install_chef_workstation
+++ b/xCAT/postscripts/install_chef_workstation
@@ -53,7 +53,11 @@ fi
 
 if [ -z "$chefserver" ]
 then
-    if [ -n "$CHEFSERVER" ]
+    if [ -n "$CFGSERVER" ]
+    then
+        chefserver=$CFGSERVER
+    fi
+    if [ -z "$chefserver" ]
     then
         chefserver=$CHEFSERVER
     fi
diff --git a/xCAT/templates/mypostscript/mypostscript.tmpl b/xCAT/templates/mypostscript/mypostscript.tmpl
index 74839e002..8615698df 100755
--- a/xCAT/templates/mypostscript/mypostscript.tmpl
+++ b/xCAT/templates/mypostscript/mypostscript.tmpl
@@ -114,6 +114,8 @@ export NICCUSTOMSCRIPTS
 NICNETWORKS=#TABLE:nics:$NODE:nicnetworks#
 export NICNETWORKS
 
+CFGSERVER=#TABLE:cfgmgt:$NODE:cfgserver#
+export CFGSERVER
 
 
 ##