Don't manually mess with ntpd, just enable it in kickstart

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/base/all/root/scripts/setup_cluster.sh b/base/all/root/scripts/setup_cluster.sh
index 6f7d73656b68709e923c77e88a97c922eb1e7012..cd2c9c5c8e95b31fa3439a8f1bcc16af9179c695 100755 (executable)
--- a/base/all/root/scripts/setup_cluster.sh
+++ b/base/all/root/scripts/setup_cluster.sh
@@ -54,10 +54,6 @@ domain=$(sed -r -n -e 's@^domain[[:space:]]*=[[:space:]]*([^ ]*)[[:space:]]*$@\1
 
 kdc=$(sed -r -n -e 's@^kdc[[:space:]]*=[[:space:]]*([^ ]*)[[:space:]]*$@\1@p' "$conf_file")
 
-echo "Enabling NTP and ensuring it is started..."
-onnode -p all chkconfig ntpd on
-onnode -p all service ntpd restart
-
 mmgetstate | grep active > /dev/null || {
     echo "GPFS must be running to setup Samba"
     exit 1

diff --git a/templates/RHEL5.services b/templates/RHEL5.services
index 4eadb0f0b5fc91adea745c946324a1d5bea7831b..c74db8481f26801ea3e6528e4c0019bdfe1e1c1a 100644 (file)
--- a/templates/RHEL5.services
+++ b/templates/RHEL5.services
@@ -30,3 +30,4 @@ chkconfig gpm off
 echo "Turn on some services..."
 chkconfig multipathd on
 chkconfig nfslock on
+chkconfig ntpd on

diff --git a/templates/RHEL6.services b/templates/RHEL6.services
index 5a23667f7193f5d9c6d3b9921ecfdc895b26fd23..ff501574e8a027501669e86cc91e10ef5b4d1eee 100644 (file)
--- a/templates/RHEL6.services
+++ b/templates/RHEL6.services
@@ -29,3 +29,4 @@ chkconfig gpm off
 
 echo "Turn on some services..."
 chkconfig multipathd on
+chkconfig ntpd on

diff --git a/templates/RHEL7.services b/templates/RHEL7.services
index 4e7614ff99108c6ea0a0292fac5001cc841ad8b0..36908f08ae7b112f1247992cb7207dd432ecb123 100644 (file)
--- a/templates/RHEL7.services
+++ b/templates/RHEL7.services
@@ -14,5 +14,6 @@ echo "Turn on some services..."
 while read s ; do
       systemctl enable "${s}.service"
 done <<EOF
+chronyd
 multipathd
 EOF