diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-06-06 16:19:19 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-06-06 16:19:19 -0700 |
| commit | e0573603c5780e79c2461ece604c6388e4222504 (patch) | |
| tree | 6e09e2fcbc4db7447dedc939fb4231c97423718e /lib/puppet/application | |
| parent | 4801e10c81264b20c2d35b0d44c10cfb0668d1b9 (diff) | |
| parent | 4922409a2bdf3ad6a094762c9e2e60371ed16a1b (diff) | |
| download | puppet-e0573603c5780e79c2461ece604c6388e4222504.tar.gz puppet-e0573603c5780e79c2461ece604c6388e4222504.tar.xz puppet-e0573603c5780e79c2461ece604c6388e4222504.zip | |
Merge branch '2.7.x'
* 2.7.x:
(#7624) Manually fetch all properties in instances.
(#7193) Fix path issues with acceptance tests that call old shell tests
(#7632) Make secret_agent application compatible with secret_agent face
(#7624) Auditing should not be enabled by default for purged resources.
maint: Confine augeas specs to require the augeas feature
(#2728) Add diff output for changes made by Augeas provider
Diffstat (limited to 'lib/puppet/application')
| -rw-r--r-- | lib/puppet/application/secret_agent.rb | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/lib/puppet/application/secret_agent.rb b/lib/puppet/application/secret_agent.rb index d704d14b2..6bdbc9232 100644 --- a/lib/puppet/application/secret_agent.rb +++ b/lib/puppet/application/secret_agent.rb @@ -1,23 +1,6 @@ -require 'puppet/application' +require 'puppet/application/face_base' require 'puppet/face' -class Puppet::Application::Secret_agent < Puppet::Application - should_parse_config +class Puppet::Application::Secret_agent < Puppet::Application::FaceBase run_mode :agent - - option("--debug", "-d") - option("--verbose", "-v") - - def setup - if options[:debug] or options[:verbose] - Puppet::Util::Log.level = options[:debug] ? :debug : :info - end - - Puppet::Util::Log.newdestination(:console) - end - - def run_command - report = Puppet::Face[:secret_agent, '0.0.1'].synchronize(Puppet[:certname]) - Puppet::Face[:report, '0.0.1'].submit(report) - end end |