Merge "Add ntp-dev to requirements"

bootstrap/module.mk

@@ -38,7 +38,7 @@ BOOTSTRAP_RPMS:=\
 	mcollective \
 	mingetty \
 	net-tools \
-	ntp \
+	ntp-dev \
 	openssh-clients \
 	openssh-server \
 	pciutils \

bootstrap/sync/usr/bin/fix-configs-on-startup

@@ -49,11 +49,8 @@ chown ntp: /var/lib/ntp/drift
 #
 sed -i "/^\s*server\b/ d" /etc/ntp.conf
 echo "server $masternode_ip burst iburst" >> /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
+/etc/init.d/sntp restart
+/etc/init.d/ntpd restart
 
 #
 # Update mcollective config

iso/ks.template

@@ -246,7 +246,7 @@ lsof
 man
 mlocate
 nmap-ncat
-ntp
+ntp-dev
 openssh-clients
 policycoreutils
 python-daemon
@@ -545,6 +545,8 @@ rm -rf ${FS}
 echo "server 127.127.1.0"            >> /etc/ntp.conf
 echo "fudge  127.127.1.0 stratum 10" >> /etc/ntp.conf
 echo "tos    orphan 7"               >> /etc/ntp.conf
+mkdir /var/lib/ntp
+chown -R ntp:ntp /var/lib/ntp
 
 # Do not show error message on ntpdate failure. Customers should not be confused
 # if admin node does not have access to the internet time servers.

requirements-deb.txt

@@ -188,6 +188,8 @@ nova-objectstore
 nova-scheduler
 novnc
 ntp
+ntp-dev
+ntpdate
 openhpid
 openssh-server
 openstack-dashboard

requirements-rpm.txt

@@ -277,6 +277,7 @@ nodejs-less-1.3.3-3.el6
 novnc-0.4
 nrpe-2.14-3.el6
 ntp
+ntp-dev
 numpy-1.4.1-9.el6
 openssh-clients
 openssh-server