xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-02 11:37:07 +00:00
Code Issues Releases Wiki Activity

Remove trailing spaces in file xCAT/postscripts/install_puppet_server

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

32
xCAT/postscripts/install_puppet_server
View File

@ -11,10 +11,10 @@ fi
#=head1 install_puppet_server
#=head2 This command installs the puppet server on a xCAT server or node.
# It is used on Ubuntu only.
# Usage:
# Usage:
# set $PUPPETSERVER as the puppet server on site table. The default is
# site.master
# install_puppet_server
# install_puppet_server
# or
# updatenode <node> install_puppet_server
#=cut
@ -45,54 +45,54 @@ if [ "$os" == "Ubuntu" ]; then
apt-get -y autoremove puppetmaster puppet --purge
rm -Rf /etc/puppet/*
rm -Rf /var/lib/puppet/*
echo "Adding new repositories....."
#get os release name
urelease="precise" #default release name
urelease=`cat /etc/lsb-release |grep DISTRIB_CODENAME |cut -d= -f2`
#add ubuntu repositories from the net.
#We use us mirror, what about for the customers of other contires?
#We use us mirror, what about for the customers of other contires?
echo "deb http://us.archive.ubuntu.com/ubuntu/ $urelease main" > /etc/apt/sources.list.d/os_remote.list
echo "deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates main" >> /etc/apt/sources.list.d/os_remote.list
echo "deb http://us.archive.ubuntu.com/ubuntu/ $urelease universe" >> /etc/apt/sources.list.d/os_remote.list
echo "deb http://us.archive.ubuntu.com/ubuntu/ ${urelease}-updates universe" >> /etc/apt/sources.list.d/os_remote.list
#add the puppet lab repositories
#add the puppet lab repositories
repname=puppetlabs-release-${urelease}.deb
wget -N --waitretry=10 --random-wait -T 60 http://apt.puppetlabs.com/$repname -P /tmp 2>> /tmp/wget.log
rc=$?
if [ $rc -eq 0 ] && [ -f /tmp/$repname ]; then
dpkg -i /tmp/$repname
apt-get update
else
else
echo "Cannot download http://apt.puppetlabs.com/$repname"
exit 1
fi
rm /tmp/$repname
rm /tmp/$repname
#refresh the repository
apt-get -y update
echo "Installing puppet server....."
#install puppet server
apt-get -y install puppetmaster
#install rake and git
apt-get -y install rake git
#Now configure the pupper server
result=`dirname $0`
${result}/config_puppet_server "$@"
#restart puppet master
#service puppetmaster stop
stopservice puppetmaster
kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}')
kill $(ps auxww | grep puppet | grep master | grep -v grep | awk '{print $2}')
#service puppetmaster start
startservice puppetmaster
elif [ "$os" == "RedHat" ]; then
echo "Puppet server installation with xCAT on RedHat is through a kit. Please refer to ... for details.".
else