summaryrefslogtreecommitdiffstats
path: root/lib/puppet/executables
diff options
context:
space:
mode:
Diffstat (limited to 'lib/puppet/executables')
-rw-r--r--lib/puppet/executables/client/certhandler.rb15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib/puppet/executables/client/certhandler.rb b/lib/puppet/executables/client/certhandler.rb
index 6f23de0e3..b73642941 100644
--- a/lib/puppet/executables/client/certhandler.rb
+++ b/lib/puppet/executables/client/certhandler.rb
@@ -4,8 +4,7 @@ module Puppet
module Client
class CertHandler
attr_writer :wait_for_cert, :one_time
-
- attr_reader :caclient
+ attr_reader :caclient, :new_cert
def initialize(wait_time, is_one_time)
@wait_for_cert = wait_time
@@ -14,7 +13,14 @@ module Puppet
@caclient = Puppet::Network::Client.ca.new()
end
+
+ # Did we just read a cert?
+ def new_cert?
+ new_cert
+ end
+ # Read, or retrieve if necessary, our certificate. Returns true if we retrieved
+ # a new cert, false if the cert already exists.
def read_retrieve
#NOTE: ACS this is checking that a file exists, maybe next time just do that?
unless read_cert
@@ -23,7 +29,7 @@ module Puppet
retrieve_cert
end
- !@new_cert
+ ! new_cert?
end
def retrieve_cert
@@ -54,7 +60,8 @@ module Puppet
def read_new_cert
if caclient.read_cert
# If we read it in, then we need to get rid of our existing http connection.
- # The @new_cert flag will help us do that
+ # The @new_cert flag will help us do that, in that it provides a way
+ # to notify that the cert status has changed.
@new_cert = true
Puppet.notice "Got signed certificate"
else