x/compass-adapters
Code Issues Proposed changes

Merge "fix ntp server bug"

Browse Source
This commit is contained in:
Jenkins 2014-06-18 17:38:40 +00:00 committed by Gerrit Code Review
commit 6ebf72bb80
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cobbler/snippets/kickstart_ntp
View File

@ -1,4 +1,4 @@
#if $getVar('ntp_server', '') != "" #if $getVar('ntp_server', '') == ""
#set $ntp_server = '0.centos.pool.ntp.org' #set $ntp_server = '0.centos.pool.ntp.org'
#end if #end if
chkconfig ntpd on chkconfig ntpd on
@ -34,9 +34,7 @@ restrict -6 ::1
# server 0.centos.pool.ntp.org # server 0.centos.pool.ntp.org
# server 1.centos.pool.ntp.org # server 1.centos.pool.ntp.org
# server 2.centos.pool.ntp.org # server 2.centos.pool.ntp.org
#if $getVar('ntp_server', '') != ""
server $ntp_server server $ntp_server
#end if
# broadcast 192.168.1.255 autokey # broadcast server # broadcast 192.168.1.255 autokey # broadcast server
# broadcastclient # broadcast client # broadcastclient # broadcast client

2
cobbler/snippets/preseed_chef_init
View File

@ -1,5 +1,5 @@
## A self-destruct service to boot chef client and register cron job ## A self-destruct service to boot chef client and register cron job
#if $getVar('ntp_server', '') != "" #if $getVar('ntp_server', '') == ""
#set $ntp_server = '0.ubuntu.pool.ntp.org' #set $ntp_server = '0.ubuntu.pool.ntp.org'
#end if #end if
echo "#!/bin/bash" > /target/etc/init.d/chef; \ echo "#!/bin/bash" > /target/etc/init.d/chef; \

4
cobbler/snippets/preseed_ntp
View File

@ -1,5 +1,5 @@
#if $getVar('ntp_server', '') != "" #if $getVar('ntp_server', '') == ""
#set $ntp_server = '0.centos.pool.ntp.org' #set $ntp_server = '0.ubuntu.pool.ntp.org'
#end if #end if
echo "driftfile /var/lib/ntp/ntp.drift" > /target/etc/ntp.conf; \ echo "driftfile /var/lib/ntp/ntp.drift" > /target/etc/ntp.conf; \
echo "#statsdir /var/log/ntpstats/" >> /target/etc/ntp.conf; \ echo "#statsdir /var/log/ntpstats/" >> /target/etc/ntp.conf; \