Release 2.5.0

CHANGELOG.md

@@ -1,13 +1,18 @@
 # PEADM module
 
-## UNRELEASED
+## 2.5.0
 ### Summary
 
+### Changes
+
+- Require WhatsARanjit-node\_manager >= 0.7.5
+- Require puppetlabs-stdlib >= 6.5.0
+
 ### Improvements
 
 - Support PE 2021.0
-- 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.
+- 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
 - Switch dependency enumeration from in-project Puppetfile to bolt-project.yaml modules setting
 
 ## 2.4.5

bolt-project.yaml

@@ -2,13 +2,9 @@
 name: peadm
 
 modules:
-- name: puppet/format
-
-- name: puppetlabs/apply_helpers
-- name: puppetlabs/bolt_shim
-- name: puppetlabs/service
-- name: puppetlabs/stdlib
-
+- name: 'puppet/format'
+- name: 'puppetlabs/apply_helpers'
+- name: 'puppetlabs/bolt_shim'
+- name: 'puppetlabs/service'
+- name: 'puppetlabs/stdlib'
 - name: 'WhatsARanjit/node_manager'
-  git: 'https://github.com/WhatsARanjit/puppet-node_manager.git'
-  ref: '3775a9d07bdea9a9258225dc7053118b1f2fd871' # 0.7.4-1-g3775a9d

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-peadm",
-  "version": "2.4.5",
+  "version": "2.5.0",
   "author": "puppetlabs",
   "summary": "Bolt plans used to deploy an at-scale Puppet Enterprise architecture",
   "license": "Apache-2.0",
@@ -10,11 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.20.0 < 7.0.0"
+      "version_requirement": ">= 6.5.0 < 8.0.0"
     },
     {
       "name": "WhatsARanjit/node_manager",
-      "version_requirement": ">= 0.7.4 < 2.0.0"
+      "version_requirement": ">= 0.7.5 < 2.0.0"
     },
     {
       "name": "puppetlabs/bolt_shim",
@@ -26,7 +26,7 @@
     },
     {
       "name": "puppet/format",
-      "version_requirement": ">= 0.1.0 < 1.0.0"
+      "version_requirement": ">= 0.1.0 < 2.0.0"
     },
     {
       "name": "puppetlabs/service",

plans/upgrade.pp

@@ -167,7 +167,7 @@
 
       $pe_conf = ($current_pe_conf ? {
         undef   => {},
-        default => $current_pe_conf.peadm::parsehocon(),
+        default => $current_pe_conf.parsehocon(),
       } + {
         'console_admin_password'                => 'not used',
         'puppet_enterprise::puppet_master_host' => $master_target.peadm::target_name(),