Add the new params to init.pp as well

Author: natemccurdy

README.md

@@ -405,7 +405,7 @@ The password for the database user. Defaults to `puppetdb`, ignored for
 
 #### `manage_db_password`
 
-Whether or not the database_password in database.ini will be managed by this module.
+Whether or not the database password in database.ini will be managed by this module.
 Set this to `false` if you want to set the password some other way.
 Defaults to `true`
 
@@ -569,7 +569,7 @@ supported in PuppetDB >= 1.6.
 
 #### `manage_read_db_password`
 
-Whether or not the database\_password in read-database.ini will be managed by this module.
+Whether or not the database password in read-database.ini will be managed by this module.
 Set this to `false` if you want to set the password some other way.
 Defaults to `true`
 

manifests/init.pp

@@ -30,6 +30,7 @@
   $database_username                 = $puppetdb::params::database_username,
   $database_password                 = $puppetdb::params::database_password,
   $database_name                     = $puppetdb::params::database_name,
+  $manage_db_password                = $puppetdb::params::manage_db_password,
   $jdbc_ssl_properties               = $puppetdb::params::jdbc_ssl_properties,
   $database_listen_address           = $puppetdb::params::postgres_listen_addresses,
   $database_validate                 = $puppetdb::params::database_validate,
@@ -53,6 +54,7 @@
   $read_database_username            = $puppetdb::params::read_database_username,
   $read_database_password            = $puppetdb::params::read_database_password,
   $read_database_name                = $puppetdb::params::read_database_name,
+  $manage_read_db_password           = $puppetdb::params::manage_read_db_password,
   $read_database_jdbc_ssl_properties = $puppetdb::params::read_database_jdbc_ssl_properties,
   $read_database_validate            = $puppetdb::params::read_database_validate,
   $read_log_slow_statements          = $puppetdb::params::read_log_slow_statements,
@@ -105,6 +107,7 @@
     database_username                 => $database_username,
     database_password                 => $database_password,
     database_name                     => $database_name,
+    manage_db_password                => $manage_db_password,
     jdbc_ssl_properties               => $jdbc_ssl_properties,
     database_validate                 => $database_validate,
     database_embedded_path            => $database_embedded_path,
@@ -130,6 +133,7 @@
     read_database_username            => $read_database_username,
     read_database_password            => $read_database_password,
     read_database_name                => $read_database_name,
+    manage_read_db_password           => $manage_read_db_password,
     read_database_jdbc_ssl_properties => $read_database_jdbc_ssl_properties,
     read_database_validate            => $read_database_validate,
     read_log_slow_statements          => $read_log_slow_statements,

spec/unit/classes/init_spec.rb

@@ -48,6 +48,24 @@ class { 'postgresql::server':
           it { is_expected.not_to contain_postgresql__server__db('puppetdb') }
         end
       end
+
+      context 'when not managing the database password' do
+        let(:params) do
+          {
+            'manage_db_password' => false,
+            'manage_read_db_password' => false,
+            'read_database_host' => '10.0.0.1', # Make sure the read_database class is enforced.
+          }
+        end
+
+        describe 'ini_setting entries for the password will not exist' do
+          it { is_expected.to contain_class('puppetdb::server').with('manage_db_password' => false) }
+          it { is_expected.to contain_class('puppetdb::server').with('manage_read_db_password' => false) }
+
+          it { is_expected.not_to contain_ini__setting('puppetdb_psdatabase_password') }
+          it { is_expected.not_to contain_ini__setting('puppetdb_read_database_password') }
+        end
+      end
     end
   end