Skip to content

Commit 8928c72

Browse files
committed
Prep for 2.3.0 release
1 parent 8c27475 commit 8928c72

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
# PEADM module
22

3+
## 2.3.0
4+
### Summary
5+
6+
Add ability to resume peadm::upgrade or peadm::convert at an intermediate step, rather than requiring re-runs to perform all plan actions from the beginning.
7+
8+
### Features
9+
10+
- Added `begin_at_step` parameter and documentation to peadm::upgrade and peadm::convert
11+
12+
### Bugfixes
13+
14+
- In peadm::convert plan, stop the Puppet agent before writing the csr\_attributes.yaml file, to prevent possible agent interference
15+
- In the peadm::convert plan during finalization, run the Puppet agent on the primary server first, then the rest, to avoid the possibility of a puppetserver restart impacting Puppet agent runs on other systems.
16+
17+
### Improvements
18+
19+
- In the peadm::convert plan, when no peadm\_availability\_group trusted fact is present to identify if compilers should be members of the A pool or B pool, check for pp\_cluster being used to designate this configuration before falling back to a simple even/odd split. This is to catch systems provisioned with the old pe\_xl module, which used pp\_cluster to designate A/B.
20+
321
## 2.2.1
422
### Summary
523

lib/puppet/functions/peadm/plan_step.rb

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
# rubocop:disable Style/Documentation
21
# frozen_string_literal: true
32

4-
#Puppet::Functions.create_function(:'peadm::plan_step', Puppet::Functions::InternalFunction) do
53
Puppet::Functions.create_function(:'peadm::plan_step', Puppet::Functions::InternalFunction) do
64
dispatch :plan_step do
75
scope_param
@@ -11,9 +9,9 @@
119

1210
def plan_step(scope, step_name)
1311
first_step = scope.bound?('begin_at_step') ? scope['begin_at_step'] : nil
14-
first_step_reached = if first_step.nil? or scope.bound?('__first_plan_step_reached__')
12+
first_step_reached = if first_step.nil? || scope.bound?('__first_plan_step_reached__')
1513
true
16-
elsif (step_name == first_step)
14+
elsif step_name == first_step
1715
scope['__first_plan_step_reached__'] = true
1816
else
1917
false

metadata.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-peadm",
3-
"version": "2.2.1",
3+
"version": "2.3.0",
44
"author": "puppetlabs",
55
"summary": "Bolt plans used to deploy an at-scale Puppet Enterprise architecture",
66
"license": "Apache-2.0",

0 commit comments

Comments
 (0)