[bootstrap] Add some debug messages to ntpdate. Fix timezone for all node types.

This commit is contained in:
Andrey Danin 2012-12-26 17:16:43 +04:00 committed by default
parent 15216bcb7c
commit dc464b7dc1
6 changed files with 9 additions and 3 deletions

View File

@ -2,7 +2,7 @@
mount -t devpts devpts /dev/pts
fix-configs-on-startup || true
flock -w 0 -o /var/lock/agent.lock -c "/opt/nailgun/bin/agent > /var/log/agent.log 2>&1" || true
fix-mcollective-config || true
touch /var/lock/subsys/local

View File

@ -0,0 +1 @@
ZONE="UTC"

1
bootstrap/sync/etc/timezone Symbolic link
View File

@ -0,0 +1 @@
/usr/share/zoneinfo/UTC

View File

@ -7,6 +7,9 @@ masternode_ip=`sed -rn 's/^.*url=http:\/\/(([0-9]{1,3}\.){3}[0-9]{1,3}).*$/\1/ p
#
sed -i "/^server\b/ d" /etc/ntp.conf
echo "server $masternode_ip" >> /etc/ntp.conf
# Add some additional logs in ntpdate init script.
sed -i '46 a logger -t ntpdate-log -- `echo /usr/sbin/ntpdate $OPTIONS $tickers` || true\
/usr/sbin/ntpdate $OPTIONS -d $tickers &> /dev/null' /etc/init.d/ntpdate
/etc/init.d/ntpdate start
/etc/init.d/ntpd start
@ -15,6 +18,7 @@ echo "server $masternode_ip" >> /etc/ntp.conf
#
sed -i "s/^plugin.stomp.host\b.*$/plugin.stomp.host = $masternode_ip/" /etc/mcollective/server.cfg
sed -i "s/^plugin.stomp.password\b.*$/plugin.stomp.password = marionette/" /etc/mcollective/server.cfg
sed -i "s/^loglevel\b.*$/loglevel = debug/" /etc/mcollective/server.cfg
echo "direct_addressing = 1" >> /etc/mcollective/server.cfg
service mcollective restart

View File

@ -5,7 +5,7 @@ reboot --eject
lang en_US.UTF-8
keyboard us
rootpw r00tme
timezone --utc America/Los_Angeles
timezone --utc UTC
zerombr
bootloader --location=mbr
clearpart --all --initlabel

View File

@ -5,7 +5,7 @@ class nailgun::cobbler(
$centos_repos,
$gem_source,
$ks_system_timezone = "America/Los_Angeles",
$ks_system_timezone = "UTC",
# default password is 'r00tme'
$ks_encrypted_root_password = "\$6\$tCD3X7ji\$1urw6qEMDkVxOkD33b4TpQAjRiCeDZx0jmgMhDYhfB9KuGfqO9OcMaKyUxnGGWslEDQ4HxTw7vcAMP85NxQe61",