logic in manifest

Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/modules/ntpdate/manifests/init.pp b/modules/ntpdate/manifests/init.pp
index ca21a4d..aa52c64 100644 (file)
--- a/modules/ntpdate/manifests/init.pp
+++ b/modules/ntpdate/manifests/init.pp
@@ -8,6 +8,11 @@ class ntpdate {
                        ensure => installed
                }
 
+               $ntpservers = $::hostname ? {
+                       ancina  => 'ntp.ugent.be',
+                       default => ['merikanto.debian.org','orff.debian.org','ravel.debian.org','busoni.debian.org']
+               }
+
                file { '/etc/default/ntpdate':
                        content => template('ntpdate/etc-default-ntpdate.erb'),
                }

diff --git a/modules/ntpdate/templates/etc-default-ntpdate.erb b/modules/ntpdate/templates/etc-default-ntpdate.erb
index 52be685..ee12a56 100644 (file)
--- a/modules/ntpdate/templates/etc-default-ntpdate.erb
+++ b/modules/ntpdate/templates/etc-default-ntpdate.erb
@@ -14,14 +14,9 @@ NTPDATE_USE_NTP_CONF=no
 NTPSERVERS=""
 <%=
        out = []
-       if fqdn == "ancina.debian.org"
-               ntpservers = %w{ntp.ugent.be}
-       else
-               ntpservers = %w{merikanto.debian.org orff.debian.org ravel.debian.org busoni.debian.org}
-       end
 
        require 'resolv'
-       ntpservers.each do |n|
+       scope.lookupvar('ntpservers').to_a.flatten.each do |n|
                begin
                        ip = Resolv.getaddress(n)
                        out << "NTPSERVERS=\"$NTPSERVERS #{ip}\" # #{n}"