From 53d0fde15feb30777a6929cada73d5f6e6ceb513 Mon Sep 17 00:00:00 2001 From: David Schmitt Date: Sun, 31 May 2009 21:14:37 +0200 Subject: Major cleanup of the common module * improve documentation on all defines * rename modules_dir to module_dir and modules_file to module_file * create $module_dir_path to achieve DRY-ness * silence the lsb_release stuff * improve concatenated_file to use an intermediate file, improving reliability and decoupling the updateing from notifying our peers. * remove serveral functions that were moved to puppet proper: - sha1 => sha1 - gsub,substitute,slash_escape => regsubst --- manifests/classes/lsb_release.pp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'manifests/classes') diff --git a/manifests/classes/lsb_release.pp b/manifests/classes/lsb_release.pp index 8455a56..bf9baeb 100644 --- a/manifests/classes/lsb_release.pp +++ b/manifests/classes/lsb_release.pp @@ -14,12 +14,15 @@ # # To fail individual resources on a missing lsbdistcodename, require # Exec[assert_lsbdistcodename] on the specific resource +# +# This is just one example of how you could avoid evaluation of parts of the +# manifest, before a bootstrapping class has enabled all the necessary goodies. class assert_lsbdistcodename { case $lsbdistcodename { '': { err("Please install lsb_release or set facter_lsbdistcodename in the environment of $fqdn") - exec { "false # assert_lsbdistcodename": alias => assert_lsbdistcodename } + exec { "false # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => err } } 'n/a': { case $operatingsystem { @@ -30,11 +33,11 @@ class assert_lsbdistcodename { err("lsb_release was unable to report your distcodename; please set facter_lsbdistcodename in the environment of $fqdn") } } - exec { "false # assert_lsbdistcodename": alias => assert_lsbdistcodename } + exec { "false # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => err } } default: { - exec { "true # assert_lsbdistcodename": alias => assert_lsbdistcodename } - exec { "true # require_lsbdistcodename": alias => require_lsbdistcodename } + exec { "true # assert_lsbdistcodename": alias => assert_lsbdistcodename, loglevel => debug } + exec { "true # require_lsbdistcodename": alias => require_lsbdistcodename, loglevel => debug } } } @@ -42,5 +45,5 @@ class assert_lsbdistcodename { # To fail the complete compilation, include this class class require_lsbdistcodename inherits assert_lsbdistcodename { - exec { "false # require_lsbdistcodename": require => Exec[require_lsbdistcodename], } + exec { "false # require_lsbdistcodename": require => Exec[require_lsbdistcodename], loglevel => err } } -- cgit v1.2.3