diff options
| -rwxr-xr-x | bin/puppetmasterd | 9 | ||||
| -rw-r--r-- | lib/puppet/sslcertificates/ca.rb | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/bin/puppetmasterd b/bin/puppetmasterd index 96b2c9c2d..2fd27ac46 100755 --- a/bin/puppetmasterd +++ b/bin/puppetmasterd @@ -46,7 +46,8 @@ # Do not function as a file bucket. # # noca:: -# Do not function as a certificate authority. +# Do not function as a certificate authority. This is deprecated. Use '--no-ca' +# now. # # nonodes:: # Do not use individual node designations; each node will receive the result @@ -111,7 +112,6 @@ bucket = {} args = {} options = { - :haveca => true, :havereport => true, :havebucket => true, :havemaster => true, @@ -137,7 +137,8 @@ begin when "--noreports" options[:havereport] = false when "--noca" - options[:haveca] = false + Puppet[:ca] = false + Puppet.warning "--noca is deprecated. Please use --no-ca." when "--nomaster" options[:havemaster] = false when "--nobucket" @@ -219,7 +220,7 @@ if options[:havereport] handlers[:Report] = report end -if options[:haveca] +if Puppet[:ca] handlers[:CA] = ca end diff --git a/lib/puppet/sslcertificates/ca.rb b/lib/puppet/sslcertificates/ca.rb index 572abafd7..13b845472 100644 --- a/lib/puppet/sslcertificates/ca.rb +++ b/lib/puppet/sslcertificates/ca.rb @@ -5,6 +5,8 @@ class Puppet::SSLCertificates::CA attr_accessor :keyfile, :file, :config, :dir, :cert, :crl Puppet.setdefaults(:ca, + :ca => [true, + "Whether a CA should be started in puppetmasterd."], :cadir => { :default => "$ssldir/ca", :owner => "$user", :group => "$group", |