Iterative fix improvement

To try and avoid dealing with the complexity of PuppetDB database host
picking at the end of the manifest, see if having a sane class parameter
default solves the problem cleanly. If it does, we can do a simple
switch on replica/no-replica to create the B groups.

Author: reidmv

manifests/setup/node_manager.pp

@@ -13,11 +13,12 @@
 #
 class peadm::setup::node_manager (
   String[1] $master_host,
-  String[1] $puppetdb_database_host,
+  String[1] $puppetdb_database_host = $master_host,
+
   String[1] $compiler_pool_address,
 
   Optional[String[1]] $master_replica_host            = undef,
-  Optional[String[1]] $puppetdb_database_replica_host = undef,
+  Optional[String[1]] $puppetdb_database_replica_host = $master_replica_host,
 ) {
 
   ##################################################
@@ -129,9 +130,7 @@
       },
       variables => { 'peadm_replica' => true },
     }
-  }
 
-  if $puppetdb_database_replica_host {
     node_group { 'PE Master B':
       ensure => present,
       parent => 'PE Infrastructure',
@@ -148,14 +147,7 @@
         },
       },
     }
-  }
 
-  if ($puppetdb_database_replica_host) or ($master_replica_host) {
-    if ($puppetdb_database_replica_host) {
-      $dbhost = $puppetdb_database_replica_host
-    } else {
-      $dbhost = $puppetdb_database_host
-    }
     node_group { 'PE Compiler Group B':
       ensure  => 'present',
       parent  => 'PE Master',
@@ -165,7 +157,7 @@
       ],
       classes => {
         'puppet_enterprise::profile::puppetdb' => {
-          'database_host' => $dbhost,
+          'database_host' => $puppetdb_database_replica_host,
         },
         'puppet_enterprise::profile::master'   => {
           'puppetdb_host' => ['${clientcert}', $master_host], # lint:ignore:single_quote_string_with_variables

plans/action/configure.pp

@@ -25,10 +25,7 @@
   $master_replica_target            = peadm::get_targets($master_replica_host, 1)
   $puppetdb_database_replica_target = peadm::get_targets($puppetdb_database_replica_host, 1)
   $compiler_targets                 = peadm::get_targets($compiler_hosts)
-  $puppetdb_database_target         = $puppetdb_database_host ? {
-    undef   => $master_target,
-    default => peadm::get_targets($puppetdb_database_host, 1)
-  }
+  $puppetdb_database_target         = peadm::get_targets($puppetdb_database_host, 1)
 
   # Ensure input valid for a supported architecture
   $arch = peadm::validate_architecture(