Merge pull request #51 from yo61/feature/rename_puppetdb_ssl_to_puppe…

…tdb_ssl_verify puppetdb_ssl renamed to puppetdb_ssl_verify
voxpupuli · Sep 8, 2014 · 9d9c74a · 9d9c74a
2 parents a302929 + 50127b5
commit 9d9c74a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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