From c726564ee0ae69c9dfc5ff81de0e69db6f15a775 Mon Sep 17 00:00:00 2001
From: GONG Jie <gongjie@linux.vnet.ibm.com>
Date: Sun, 31 Dec 2017 23:59:59 +0000
Subject: [PATCH] Remove trailing spaces in file
 xCAT/postscripts/config_puppet_server

---
 xCAT/postscripts/config_puppet_server | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/xCAT/postscripts/config_puppet_server b/xCAT/postscripts/config_puppet_server
index d0e01fd7e..eb91514eb 100755
--- a/xCAT/postscripts/config_puppet_server
+++ b/xCAT/postscripts/config_puppet_server
@@ -22,26 +22,26 @@ else
     xcatroot="/opt/xcat"
 fi
 
-#use site.puppetserver or site.master as the puppet server certname 
-if [ -n "$PUPPETSERVER" ]; then 
+#use site.puppetserver or site.master as the puppet server certname
+if [ -n "$PUPPETSERVER" ]; then
     node=$PUPPETSERVER
-else 
-    tmp=`XCATBYPASS=Y $xcatroot/bin/lsdef -t site clustersite  2>&1 |grep "puppetserver="` 
+else
+    tmp=`XCATBYPASS=Y $xcatroot/bin/lsdef -t site clustersite  2>&1 |grep "puppetserver="`
     if [ $? -eq 0 ]; then
 	node=`echo $tmp|cut -d= -f2`
     fi
-fi    
+fi
 if [ -z "$node" ]; then
-    if [ -n "$SITEMASTER" ]; then 
+    if [ -n "$SITEMASTER" ]; then
 	node=$SITEMASTER
-    else 
+    else
 	tmp=`XCATBYPASS=Y $xcatroot/bin/lsdef -t site clustersite  2>&1 |grep "master="`
 	if [ $? -eq 0 ]; then
 	    node=`echo $tmp|cut -d= -f2`
 	fi
     fi
 fi
-if [ -z "$node" ]; then    
+if [ -z "$node" ]; then
     if [ -n "$NODE" ]; then
 	node=$NODE
     else
@@ -76,7 +76,7 @@ fi
 sed -i "/\[main\]/ a\
     certname = $node" $confname
 sed -i "/\[main\]/ a\
-    server = $node" $confname    
+    server = $node" $confname
 
 #create a site manifest site.pp on the master:
 cat > /etc/puppet/manifests/site.pp << EOT