Merge pull request #107 from ebarrere/ebFix_puppetdb_conn_validator

Fix #106 and one other bug when disable_ssl = true

Author: kbarber

manifests/master/config.pp

@@ -1,7 +1,7 @@
 # Manage puppet configuration. See README.md for more details.
 class puppetdb::master::config(
   $puppetdb_server             = $::fqdn,
-  $puppetdb_port               = 8081,
+  $puppetdb_port               = $puppetdb::disable_ssl ? { true => 8080, default => 8081, },
   $puppetdb_soft_write_failure = false,
   $manage_routes               = true,
   $manage_storeconfigs         = true,
@@ -28,6 +28,7 @@
     puppetdb_conn_validator { 'puppetdb_conn':
       puppetdb_server => $manage_config ? { true => $puppetdb_server, default => undef },
       puppetdb_port   => $manage_config ? { true => $puppetdb_port, default => undef },
+      use_ssl         => $puppetdb_port ? { 8080 => false, default => true },
       timeout         => $puppetdb_startup_timeout,
       require         => Package[$terminus_package],
     }

manifests/master/puppetdb_conf.pp

@@ -3,7 +3,7 @@
 class puppetdb::master::puppetdb_conf (
   $server             = 'localhost',
   $port               = '8081',
-  $soft_write_failure = false,
+  $soft_write_failure = $puppetdb::disable_ssl ? { true => true, default => false, },
   $puppet_confdir     = $puppetdb::params::puppet_confdir,
 ) inherits puppetdb::params {