Merge pull request #134 from puppetlabs/GH-130-purge_behavior

Use node_manager's new purge_behavior parameter

Author: reidmv

CHANGELOG.md

@@ -6,6 +6,7 @@
 ### Improvements
 
 - Handle exit code 11 from replica upgrade task gracefully. Code 11 means "PuppetDB sync in progress but not yet complete".
+- Further remediate the bug fixed in 2.4.2, by ensuring that all peadm-managed node groups preserve existing data or class parameters not explicitly being managed. This is accomplished by requiring a new version of WhatsARanjit-node\_manager, v0.7.4.
 
 ## 2.4.5
 ### Summary

lib/puppet/functions/peadm/merge_ng_config_data.rb

@@ -44,6 +44,13 @@
   Optional[String[1]] $puppetdb_database_replica_host = $master_replica_host,
 ) {
 
+  # Preserve existing user data and classes values. We only need to make sure
+  # the values we care about are present; we don't need to remove anything
+  # else.
+  Node_group {
+    purge_behavior => none,
+  }
+
   ##################################################
   # PE INFRASTRUCTURE GROUPS
   ##################################################
@@ -62,9 +69,7 @@
   # out-of-box configuration of the group.
   $compiler_pool_address_data = $compiler_pool_address ? {
     undef   => undef,
-    default => Deferred('peadm::merge_ng_config_data', ['PE Master',
-      { 'pe_repo' => { 'compile_master_pool_address' => $compiler_pool_address } }
-    ]),
+    default => { 'pe_repo' => { 'compile_master_pool_address' => $compiler_pool_address } },
   }
 
   node_group { 'PE Master':

manifests/setup/node_manager.pp

@@ -14,7 +14,7 @@
     },
     {
       "name": "WhatsARanjit/node_manager",
-      "version_requirement": ">= 0.7.3 < 2.0.0"
+      "version_requirement": ">= 0.7.4 < 2.0.0"
     },
     {
       "name": "puppetlabs/bolt_shim",