Expand GH-130 merge pattern to all node groups

At least for the configuration data attribute. A long-term solution is
going to need to be modifying WhatsARanjit/node_manager to support a
`purge` parameter to control this behavior on various different
attributes.

Author: reidmv

Diff for: lib/puppet/functions/peadm/merge_ng_config_data.rb

@@ -24,7 +24,8 @@ def merge_ng_config_data(group_name, new_config_data)
 
     ng = Puppet::Util::Nc_https.new
     group = ng.get_groups.select { |g| g['name'] == group_name }.first
-    group['config_data'].deep_merge(new_config_data)
+    data = group ? group['config_data'] : {}
+    data.deep_merge(new_config_data)
   rescue StandardError => e
     Puppet.warn "Error attempting to read and merge node_group config data for #{group_name}: #{e.message}"
     new_config_data

Diff for: manifests/setup/node_manager.pp

@@ -95,14 +95,14 @@
       ['=', ['trusted', 'extensions', peadm::oid('peadm_role')], 'puppet/master'],
       ['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'A'],
     ],
-    data   => {
+    data   => Deferred('peadm::merge_ng_config_data', ['PE Master A', {
       'puppet_enterprise::profile::primary_master_replica' => {
         'database_host_puppetdb' => $puppetdb_database_host,
       },
       'puppet_enterprise::profile::puppetdb'               => {
         'database_host' => $puppetdb_database_host,
       },
-    },
+    }]),
   }
 
   # Configure the A pool for compilers. There are up to two pools for HA, each
@@ -123,12 +123,12 @@
         'puppetdb_port' => [8081],
       }
     },
-    data    => {
+    data    => Deferred('peadm::merge_ng_config_data', ['PE Compiler Group A', {
       # Workaround for GH-118
       'puppet_enterprise::profile::master::puppetdb' => {
         'ha_enabled_replicas' => [ ],
       },
-    },
+    }]),
   }
 
   # Create the replica and B groups if a replica master and database host are
@@ -154,14 +154,14 @@
         ['=', ['trusted', 'extensions', peadm::oid('peadm_role')], 'puppet/master'],
         ['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'B'],
       ],
-      data   => {
+      data   => Deferred('peadm::merge_ng_config_data', ['PE Master B', {
         'puppet_enterprise::profile::primary_master_replica' => {
           'database_host_puppetdb' => $puppetdb_database_replica_host,
         },
         'puppet_enterprise::profile::puppetdb'               => {
           'database_host' => $puppetdb_database_replica_host,
         },
-      },
+      }]),
     }
 
     node_group { 'PE Compiler Group B':
@@ -180,12 +180,12 @@
           'puppetdb_port' => [8081],
         }
       },
-      data    => {
+      data    => Deferred('peadm::merge_ng_config_data', ['PE Compiler Group B', {
         # Workaround for GH-118
         'puppet_enterprise::profile::master::puppetdb' => {
           'ha_enabled_replicas' => [ ],
         },
-      },
+      }]),
     }
   }