From 284a7948f13a3932a5cc58c42f1b1bc72248c5dd Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 16 Jun 2013 01:33:30 +0200 Subject: [PATCH] Get timeserver property from ldap --- modules/debian-org/misc/local.yaml | 5 ----- modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/debian-org/misc/local.yaml b/modules/debian-org/misc/local.yaml index f7b02acd0..83c6ed3ac 100644 --- a/modules/debian-org/misc/local.yaml +++ b/modules/debian-org/misc/local.yaml @@ -229,11 +229,6 @@ host_settings: 'apache2_ftp-upcoming_mirror': - klecker.debian.org - rietz.debian.org - timeserver: - - busoni.debian.org - - merikanto.debian.org - - orff.debian.org - - ravel.debian.org not-bacula-client: - abel.debian.org - agricola.debian.org diff --git a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb index cfbaa9c4c..cf8ea9dca 100644 --- a/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb +++ b/modules/puppetmaster/lib/puppet/parser/functions/nodeinfo.rb @@ -14,6 +14,7 @@ module Puppet::Parser::Functions end nodeinfo['hoster'] = function_whohosts([nodeinfo['ldap']['ipHostNumber'], "/etc/puppet/modules/debian-org/misc/hoster.yaml"]) nodeinfo['buildd'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('buildd')) + nodeinfo['timeserver'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('timeserver')) nodeinfo['porterbox'] = (nodeinfo['ldap']['purpose'].respond_to?('include?') && nodeinfo['ldap']['purpose'].include?('porterbox')) if lookupvar('::mta') == 'exim4' -- 2.20.1