[PATCH configure] BZ #827587: do not modify ntp config

From: mmorsi <mmorsi(a)redhat.com&gt; still require package and service to be running --- recipes/ntp/manifests/client.pp | 24 ------------------------ recipes/ntp/templates/ntp.conf | 5 ----- recipes/ntp/templates/step-tickers | 4 ---- 3 files changed, 0 insertions(+), 33 deletions(-) delete mode 100644 recipes/ntp/templates/ntp.conf delete mode 100644 recipes/ntp/templates/step-tickers diff --git a/recipes/ntp/manifests/client.pp b/recipes/ntp/manifests/client.pp index 10bb3d1..566dfba 100644 --- a/recipes/ntp/manifests/client.pp +++ b/recipes/ntp/manifests/client.pp @@ -6,28 +6,4 @@ class ntp::client inherits ntp { hasstatus => true, require => Package["ntp"], } - - # default ntp servers if none-specified - # for different environments this should be changed in the branch - # only setup an override here in case there is an odd host or two - # that needs to be different from others in the same env - $default_ntpservers = [ "pool.ntp.org" ] - $ntpservers = $ntpservers ? { - '' => $default_ntpservers, - default => $ntpservers, - } - - file { "/etc/ntp.conf": - content => template("ntp/ntp.conf"), - notify => Service["ntpd"], - require => Package["ntp"], - } - file { "/etc/ntp/": - require => Package["ntp"], - } - file { "/etc/ntp/step-tickers": - content => template("ntp/ntp.conf"), - notify => Service["ntpd"], - require => Package["ntp"], - } } diff --git a/recipes/ntp/templates/ntp.conf b/recipes/ntp/templates/ntp.conf deleted file mode 100644 index 8bfd2d0..0000000 --- a/recipes/ntp/templates/ntp.conf +++ /dev/null @@ -1,5 +0,0 @@ -# /etc/ntp.conf generated by puppet -driftfile /var/lib/ntp/drift -<% for ntpserver in ntpservers -%> -server <%= ntpserver %> -<% end -%> diff --git a/recipes/ntp/templates/step-tickers b/recipes/ntp/templates/step-tickers deleted file mode 100644 index 57cd8bb..0000000 --- a/recipes/ntp/templates/step-tickers +++ /dev/null @@ -1,4 +0,0 @@ -# /etc/ntp/step-tickerts generated by puppet -<% for ntpserver in ntpservers -%> -server <%= ntpserver %> -<% end -%> -- 1.7.7.6