summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-07-03 12:09:38 -0500
committerLuke Kanies <luke@madstop.com>2008-07-03 12:09:38 -0500
commitbd3f8e37a275710873b4a7566212d8b3388fb09f (patch)
tree37abc9023e22892be4d20edb6ff8850b01abff18
parent7a6ae299621a16fa7fd8ab0fbd2c05fe723cffa4 (diff)
downloadpuppet-bd3f8e37a275710873b4a7566212d8b3388fb09f.tar.gz
puppet-bd3f8e37a275710873b4a7566212d8b3388fb09f.tar.xz
puppet-bd3f8e37a275710873b4a7566212d8b3388fb09f.zip
Fixed 1240 - puppet will function more like puppetd if graphing
or reporting are enabled.
-rw-r--r--CHANGELOG3
-rwxr-xr-xbin/puppet2
2 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index bdf722be5..94d4aee70 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
0.24.?
+ Fixed 1240 - puppet will function more like puppetd if graphing
+ or reporting are enabled.
+
Fixed #1006 - puppetrun --class works again. I added the class
membership testing to the Ldap node terminus, and added tests,
so it shouldn't break again.
diff --git a/bin/puppet b/bin/puppet
index 5e10ad460..530766800 100755
--- a/bin/puppet
+++ b/bin/puppet
@@ -212,6 +212,8 @@ begin
# Translate it to a RAL catalog
catalog = catalog.to_ral
+ catalog.host_config = true if Puppet[:graph] or Puppet[:report]
+
catalog.finalize
# And apply it