summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRichard Crowley <r@rcrowley.org>2011-03-23 00:14:59 +0000
committerRichard Crowley <r@rcrowley.org>2011-03-23 01:33:54 +0000
commit562bd0f10be966bef725896af9ec3cdc30771ac6 (patch)
tree002c8000ed6ae0cbc393090d459b0dcd8c49555d /lib
parent5d7715b0c56c6f06d916126e8470d7edb66d7687 (diff)
downloadpuppet-562bd0f10be966bef725896af9ec3cdc30771ac6.tar.gz
puppet-562bd0f10be966bef725896af9ec3cdc30771ac6.tar.xz
puppet-562bd0f10be966bef725896af9ec3cdc30771ac6.zip
Use the new name for the terminus.
Diffstat (limited to 'lib')
-rw-r--r--lib/puppet/application/certificate.rb7
-rw-r--r--lib/puppet/interface/certificate.rb3
2 files changed, 2 insertions, 8 deletions
diff --git a/lib/puppet/application/certificate.rb b/lib/puppet/application/certificate.rb
index edb4eefd3..48736fc84 100644
--- a/lib/puppet/application/certificate.rb
+++ b/lib/puppet/application/certificate.rb
@@ -6,12 +6,7 @@ class Puppet::Application::Certificate < Puppet::Application::IndirectionBase
# Since these options map CA terminology to indirector terminology, it's
# now called --ca-location.
option "--ca-location CA_LOCATION" do |arg|
- handle_terminus({
- :local => :file,
- :remote => :rest,
- :only => :file,
- :none => nil,
- }[arg.to_sym])
+ Puppet::SSL::Host.ca_location = arg.to_sym
end
end
diff --git a/lib/puppet/interface/certificate.rb b/lib/puppet/interface/certificate.rb
index c2101d926..32415ea9d 100644
--- a/lib/puppet/interface/certificate.rb
+++ b/lib/puppet/interface/certificate.rb
@@ -13,8 +13,7 @@ Puppet::Interface::Indirector.interface(:certificate) do
set_run_mode Puppet::Application[:certificate].class.run_mode
end
- Puppet::SSL::CertificateStatus.indirection.save(
- Puppet::SSL::CertificateStatus.new(name))
+ Puppet::SSL::Host.indirection.save(Puppet::SSL::Host.new(name))
end