From 50127b5b574a7e3b8e3eec9440e348ab7f6ca304 Mon Sep 17 00:00:00 2001 From: Robin Bowes Date: Mon, 8 Sep 2014 13:56:40 +0100 Subject: [PATCH] puppetdb_ssl renamed to puppetdb_ssl_verify --- README.md | 20 ++++++++++---------- manifests/init.pp | 8 ++++---- manifests/params.pp | 2 +- spec/acceptance/class_spec.rb | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 13e81363..632e93ec 100644 --- a/README.md +++ b/README.md @@ -180,11 +180,11 @@ If you would like to use certificate auth into the PuppetDB service, use any of class { 'puppetboard': manage_virtualenv => true, - puppetdb_host => 'puppet.example.com', - puppetdb_port => '8081', - puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem", - puppetdb_ssl => 'True', - puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem", + puppetdb_host => 'puppet.example.com', + puppetdb_port => '8081', + puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem", + puppetdb_ssl_verify => 'True', + puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem", } ``` @@ -196,11 +196,11 @@ Note that the above only works if you have the Puppet CA root certificate added class { 'puppetboard': manage_virtualenv => true, - puppetdb_host => 'puppet.example.com', - puppetdb_port => '8081', - puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem", - puppetdb_ssl => "'/var/lib/puppet/ssl/certs/ca.pem'", - puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem", + puppetdb_host => 'puppet.example.com', + puppetdb_port => '8081', + puppetdb_key => "/var/lib/puppet/ssl/private_keys/${::certname}.pem", + puppetdb_ssl_verify => "'/var/lib/puppet/ssl/certs/ca.pem'", + puppetdb_cert => "/var/lib/puppet/ssl/certs/${::certname}.pem", } ``` diff --git a/manifests/init.pp b/manifests/init.pp index 131f7648..e3798dc9 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -37,9 +37,9 @@ # (string, absolute path) path to PuppetMaster/CA signed client SSL key # Defaults to 'None' ($::puppetboard::params::puppetdb_key) # -# [*puppetdb_ssl*] -# (string) whether PuppetDB uses SSL or not, 'True' or 'False'. -# Defaults to 'False' ($::puppetboard::params::puppetdb_ssl) +# [*puppetdb_ssl_verify*] +# (string) whether PuppetDB uses SSL or not, 'True' or 'False', or the path to the puppet CA +# Defaults to 'False' ($::puppetboard::params::puppetdb_ssl_verify) # # [*puppetdb_cert*] # (string, absolute path) path to PuppetMaster/CA signed client SSL cert @@ -131,7 +131,7 @@ $puppetdb_host = $::puppetboard::params::puppetdb_host, $puppetdb_port = $::puppetboard::params::puppetdb_port, $puppetdb_key = $::puppetboard::params::puppetdb_key, - $puppetdb_ssl = $::puppetboard::params::puppetdb_ssl, + $puppetdb_ssl_verify = $::puppetboard::params::puppetdb_ssl_verify, $puppetdb_cert = $::puppetboard::params::puppetdb_cert, $puppetdb_timeout = $::puppetboard::params::puppetdb_timeout, $unresponsive = $::puppetboard::params::unresponsive, diff --git a/manifests/params.pp b/manifests/params.pp index dd1f554f..80e97b52 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -25,7 +25,7 @@ $puppetdb_host = 'localhost' $puppetdb_port = 8080 $puppetdb_key = undef - $puppetdb_ssl = false + $puppetdb_ssl_verify = false $puppetdb_cert = undef $puppetdb_timeout = 20 $dev_listen_host = '127.0.0.1' diff --git a/spec/acceptance/class_spec.rb b/spec/acceptance/class_spec.rb index e047adf0..a59bafb4 100644 --- a/spec/acceptance/class_spec.rb +++ b/spec/acceptance/class_spec.rb @@ -103,7 +103,7 @@ class { 'puppetboard': puppetdb_host => 'puppet.example.com', puppetdb_port => '8081', puppetdb_key => "/var/lib/puppet/ssl/private_keys/test.networkninjas.net.pem", - puppetdb_ssl => 'True', + puppetdb_ssl_verify => 'True', puppetdb_cert => "/var/lib/puppet/ssl/certs/test.networkninjas.net.pem", } EOS