xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-31 18:16:39 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT/postscripts/config_puppet_server

Browse Source
This commit is contained in:
GONG Jie 2017-12-31 23:59:59 +00:00
parent 69c1caa3e4
commit c726564ee0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xCAT/postscripts/config_puppet_server
View File

@ -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