Skip to content

Commit b51e638

Browse files
authored
Merge pull request #203 from puppetlabs/support-2021.3
Support PE 2021.3
2 parents c566465 + dded114 commit b51e638

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/test-add-replica.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
version:
1616
description: 'PE version to install'
1717
required: true
18-
default: '2019.8.7'
18+
default: '2019.8.8'
1919
ssh-debugging:
2020
description: 'Boolean; whether or not to pause for ssh debugging'
2121
required: true

.github/workflows/test-install-matrix.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
- large
2929
- extra-large-with-dr
3030
version:
31-
- 2019.8.7
32-
- 2021.2.0
31+
- 2019.8.8
32+
- 2021.3.0
3333
image:
3434
- centos-7
3535

.github/workflows/test-install.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
version:
1616
description: 'PE version to install'
1717
required: true
18-
default: '2019.8.7'
18+
default: '2021.3.0'
1919
ssh-debugging:
2020
description: 'Boolean; whether or not to pause for ssh debugging'
2121
required: true

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ The normal usage pattern for peadm is as follows.
4949

5050
### Requirements
5151

52-
* Puppet Enterprise 2019.8.1 or newer (tested with PE 2021.2)
53-
* Bolt 3.10.0 or newer (tested with Bolt 3.10.0)
52+
* Puppet Enterprise 2019.8.1 or newer (tested with PE 2021.3)
53+
* Bolt 3.17.0 or newer (tested with Bolt 3.17.0)
5454
* EL 7, EL 8, Ubuntu 18.04, or Ubuntu 20.04
5555
* Classifier Data enabled. This PE feature is enabled by default on new installs, but can be disabled by users if they remove the relevant configuration from their global hiera.yaml file. See the [PE docs](https://puppet.com/docs/pe/latest/config_console.html#task-5039) for more information.
5656

functions/assert_supported_bolt_version.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
function peadm::assert_supported_bolt_version (
55
# No arguments
66
) >> Struct[{'supported' => Boolean}] {
7-
$supported_bolt_version = '>= 3.10.0 < 4.0.0'
7+
$supported_bolt_version = '>= 3.17.0 < 4.0.0'
88
$supported = (peadm::bolt_version() =~ SemVerRange($supported_bolt_version))
99

1010
unless $supported {

functions/assert_supported_pe_version.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ function peadm::assert_supported_pe_version (
44
String $version,
55
) >> Struct[{'supported' => Boolean}] {
66
$oldest = '2019.7'
7-
$newest = '2021.2'
7+
$newest = '2021.3'
88
$supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))
99

1010
unless $supported {
1111
fail(@("REASON"/L))
1212
This version of the puppetlabs-peadm module does not support PE ${version}.
1313

14-
For PE versions older than ${oldest}, please use version 1.x of the \
15-
puppetlabs-peadm module.
14+
For PE versions older than ${oldest}, please check to see if version 1.x \
15+
or 2.x of the puppetlabs-peadm module supports your PE version.
1616

1717
For PE versions newer than ${newest}, check to see if a new version of peadm \
1818
exists which supports that version of PE.

0 commit comments

Comments
 (0)