summaryrefslogtreecommitdiffstats
path: root/lib/puppet/application
diff options
context:
space:
mode:
authorLuke Kanies <luke@puppetlabs.com>2010-06-11 09:47:57 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commit58cf8d9dcbef783e280782d56febf06822e3e4eb (patch)
tree79ea8b84df06f56f961c0fb2d8ed305611d44540 /lib/puppet/application
parent8f3e8bb31d513f67ea28a5f249aa850789a10ff2 (diff)
downloadpuppet-58cf8d9dcbef783e280782d56febf06822e3e4eb.tar.gz
puppet-58cf8d9dcbef783e280782d56febf06822e3e4eb.tar.xz
puppet-58cf8d9dcbef783e280782d56febf06822e3e4eb.zip
Working #3139 - Catalogs default to host_config
The whole host_config concept is a bit outdated now that Configurer exists, I think, (since any catalog it uses should be a host_config). However, fixing that is outside of the scope of this series. In the meantime, this does a better job of making sure every catalog except the Settings catalogs are host_configs. Signed-off-by: Luke Kanies <luke@puppetlabs.com>
Diffstat (limited to 'lib/puppet/application')
-rw-r--r--lib/puppet/application/apply.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
index 39bcd268c..19346da59 100644
--- a/lib/puppet/application/apply.rb
+++ b/lib/puppet/application/apply.rb
@@ -116,8 +116,6 @@ class Puppet::Application::Apply < Puppet::Application
# Translate it to a RAL catalog
catalog = catalog.to_ral
- catalog.host_config = true if Puppet[:graph] or Puppet[:report]
-
catalog.finalize
catalog.retrieval_duration = Time.now - starttime