summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/puppet/application/secret_agent.rb21
-rw-r--r--lib/puppet/face/secret_agent.rb1
2 files changed, 3 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
diff --git a/lib/puppet/face/secret_agent.rb b/lib/puppet/face/secret_agent.rb
index 105850cd3..79241da72 100644
--- a/lib/puppet/face/secret_agent.rb
+++ b/lib/puppet/face/secret_agent.rb
@@ -15,6 +15,7 @@ Puppet::Face.define(:secret_agent, '0.0.1') do
EOT
action(:synchronize) do
+ default
summary "Run secret_agent once."
arguments "[-v | --verbose] [-d | --debug]" # Remove this once options are introspectible
description <<-'EOT'