diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2010-07-27 15:04:04 -0700 |
|---|---|---|
| committer | markus <markus@AVA-351181.(none)> | 2010-08-03 15:19:31 -0700 |
| commit | daa801b9ff8c81e6812a08a3f6ef82f593248e9d (patch) | |
| tree | bc785a589117b5c6d614a073e7eaf40d64652167 /lib | |
| parent | 00ebf01227745edc84084d10a9d8be7439551b0f (diff) | |
| download | puppet-daa801b9ff8c81e6812a08a3f6ef82f593248e9d.tar.gz puppet-daa801b9ff8c81e6812a08a3f6ef82f593248e9d.tar.xz puppet-daa801b9ff8c81e6812a08a3f6ef82f593248e9d.zip | |
[#4344] Temporary fix to stop agent from importing modules
Due to type collection madness, agent tries to import modules
to resolve resource types. That is wrong, decreases performance,
and causes problems. This patch forces agent to not import any
files by setting ignoreimport to true.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/application/agent.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/application/agent.rb b/lib/puppet/application/agent.rb index f0e7f4d8f..2b75505fd 100644 --- a/lib/puppet/application/agent.rb +++ b/lib/puppet/application/agent.rb @@ -219,6 +219,10 @@ class Puppet::Application::Agent < Puppet::Application Puppet.settings.use :main, :agent, :ssl + # Always ignoreimport for agent. It really shouldn't even try to import, + # but this is just a temporary band-aid. + Puppet[:ignoreimport] = true + # We need to specify a ca location for all of the SSL-related i # indirected classes to work; in fingerprint mode we just need # access to the local files and we don't need a ca. |