Merge pull request #64 from bwilcox/node_manager_switch

Node manager switch

Author: reidmv

manifests/setup/node_manager.pp

@@ -12,12 +12,22 @@
 #               }'
 #
 class peadm::setup::node_manager (
+  # Common
   String[1] $master_host,
-  String[1] $puppetdb_database_host,
   String[1] $compiler_pool_address,
 
+  # High Availability
   Optional[String[1]] $master_replica_host            = undef,
-  Optional[String[1]] $puppetdb_database_replica_host = undef,
+
+  # For the next two parameters, the default values are appropriate when
+  # deploying Standard or Large architectures. These values only need to be
+  # specified differently when deploying an Extra Large architecture.
+
+  # Specify when using Extra Large
+  String[1]           $puppetdb_database_host         = $master_host,
+
+  # Specify when using Extra Large AND High Availability
+  Optional[String[1]] $puppetdb_database_replica_host = $master_replica_host,
 ) {
 
   ##################################################
@@ -129,9 +139,7 @@
       },
       variables => { 'peadm_replica' => true },
     }
-  }
 
-  if $puppetdb_database_replica_host {
     node_group { 'PE Master B':
       ensure => present,
       parent => 'PE Infrastructure',

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(