Showing with 55 additions and 50 deletions.
  1. +1 −1 .github/workflows/test-add-compiler.yaml
  2. +1 −1 .github/workflows/test-add-replica.yaml
  3. +1 −1 .github/workflows/test-backup-restore.yaml
  4. +1 −1 .github/workflows/test-failover.yaml
  5. +2 −2 .github/workflows/test-fips-install-matrix.yaml
  6. +2 −2 .github/workflows/test-install-matrix.yaml
  7. +2 −2 .github/workflows/test-install-rhel-9.yaml
  8. +1 −1 .github/workflows/test-install.yaml
  9. +1 −1 .github/workflows/test-upgrade-latest-dev.yaml
  10. +1 −1 .github/workflows/test-upgrade-latest-xlarge-dev-nightly.yaml
  11. +1 −1 .github/workflows/test-upgrade-matrix.yaml
  12. +1 −1 .github/workflows/test-upgrade.yaml
  13. +5 −0 CHANGELOG.md
  14. +1 −1 REFERENCE.md
  15. +1 −1 documentation/install.md
  16. +2 −2 documentation/upgrade.md
  17. +1 −1 examples/provision/extra-large-ha.json
  18. +1 −1 examples/provision/extra-large.json
  19. +1 −1 examples/provision/large-ha.json
  20. +1 −1 examples/provision/large.json
  21. +1 −1 examples/provision/minimal.json
  22. +1 −1 examples/provision/standard-ha.json
  23. +1 −1 examples/provision/standard.json
  24. +1 −1 functions/assert_supported_pe_version.pp
  25. +1 −1 metadata.json
  26. +1 −1 plans/install.pp
  27. +7 −7 spec/acceptance/peadm_spec/plans/install_test_cluster.pp
  28. +1 −1 spec/docker/extra-large-ha/params.json
  29. +1 −1 spec/docker/extra-large/params.json
  30. +1 −1 spec/docker/large-ha/params.json
  31. +1 −1 spec/docker/large/params.json
  32. +1 −1 spec/docker/standard-ha/params.json
  33. +1 −1 spec/docker/standard/params.json
  34. +1 −1 spec/functions/assert_supported_pe_version_spec.rb
  35. +1 −1 spec/plans/convert_spec.rb
  36. +1 −1 spec/plans/install_spec.rb
  37. +3 −3 spec/plans/subplans/install_spec.rb
  38. +2 −2 spec/plans/upgrade_spec.rb
2 changes: 1 addition & 1 deletion .github/workflows/test-add-compiler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.7'
default: '2021.7.8'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-add-replica.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.7'
default: '2021.7.8'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-backup-restore.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.7'
default: '2021.7.8'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-failover.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version_to_upgrade:
description: 'PE version to upgrade to'
required: false
default: '2021.7.7'
default: '2021.7.8'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-fips-install-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
- extra-large-with-dr
version:
- 2019.8.12
- 2021.7.7
- 2023.6.0
- 2021.7.8
- 2023.7.0
image:
- rhel-8
fips:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-install-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ jobs:
- extra-large-with-dr
version:
- 2019.8.12
- 2021.7.7
- 2023.6.0
- 2021.7.8
- 2023.7.0
image:
- centos-7
- almalinux-cloud/almalinux-8
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-install-rhel-9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ jobs:
- large
- extra-large-with-dr
version:
- 2021.7.7
- 2023.6.0
- 2021.7.8
- 2023.7.0
image:
- rhel-9
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
version:
description: 'PE version to install'
required: true
default: '2021.7.7'
default: '2021.7.8'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade-latest-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
type: string
required: true
description: "The initial version of PE to install before upgrade"
default: "2021.7.7"
default: "2021.7.8"
ssh-debugging:
description: "Boolean; whether or not to pause for ssh debugging"
required: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
architecture:
- "extra-large-with-dr"
version:
- "2021.7.7"
- "2021.7.8"
image:
- "almalinux-cloud/almalinux-8"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
version:
- '2019.8.12'
version_to_upgrade:
- '2021.7.7'
- '2021.7.8'
image:
- 'almalinux-cloud/almalinux-8'
download_mode:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ on:
upgrade_version:
description: 'PE version to upgrade to'
required: true
default: '2021.7.7'
default: '2021.7.8'
ssh-debugging:
description: 'Boolean; whether or not to pause for ssh debugging'
required: true
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.

The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).

## [v3.19.0](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.19.0) - 2024-05-08

[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.18.1...v3.19.0)

## [v3.18.1](https://github.com/puppetlabs/puppetlabs-peadm/tree/v3.18.1) - 2024-04-17

[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/v3.18.0...v3.18.1)
Expand Down Expand Up @@ -281,6 +285,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
[Full Changelog](https://github.com/puppetlabs/puppetlabs-peadm/compare/2.5.0...v3.0.0)

### Changed

- Global rename of primary/replica and postgresql parameters [#161](https://github.com/puppetlabs/puppetlabs-peadm/pull/161) ([timidri](https://github.com/timidri))
- Language and terminology updates [#153](https://github.com/puppetlabs/puppetlabs-peadm/pull/153) ([davidsandilands](https://github.com/davidsandilands))

Expand Down
2 changes: 1 addition & 1 deletion REFERENCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -1838,7 +1838,7 @@ Data type: `Peadm::Pe_version`



Default value: `'2021.7.7'`
Default value: `'2021.7.8'`

##### <a name="-peadm--install--dns_alt_names"></a>`dns_alt_names`

Expand Down
2 changes: 1 addition & 1 deletion documentation/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ Example params.json Bolt parameters file (shown: Standard):
"primary_host": "pe-xl-core-0.lab1.puppet.vm",
"console_password": "puppetlabs",
"dns_alt_names": [ "puppet", "puppet.lab1.puppet.vm" ],
"version": "2021.7.7"
"version": "2021.7.8"
}
```

Expand Down
4 changes: 2 additions & 2 deletions documentation/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ The `peadm::upgrade` plan requires as input the version of PE to upgrade to, and

Please note that when upgrading from before 2023.4 to 2023.4 or above and you are using code manager, it is nessesary to provide known hosts for r10k. r10k_known_hosts is an optional parameter and is only required one time when upgrading to 2023.4 or beyond. But if you currently use the SSH protocol to allow r10k to access your remote Git repository, your Code manager or r10k code management tool cannot function until you define the r10k_known_hosts parameter. Subsequent upgrades will already have this and it won't be required again. Please refer to the Puppet Enterprise 2023.4 Upgrade cautions for more details.

The following is an example parameters file for upgrading an Extra Large architecture deployment of PE 2023.2.0 to PE 2023.6.0.
The following is an example parameters file for upgrading an Extra Large architecture deployment of PE 2023.2.0 to PE 2023.7.0.

```json
{
"version": "2023.6.0",
"version": "2023.7.0",
"primary_host": "pe-master-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
"primary_postgresql_host": "pe-psql-09a40c-0.us-west1-a.c.reidmv-peadm.internal",
"replica_host": "pe-master-09a40c-1.us-west1-b.c.reidmv-peadm.internal",
Expand Down
2 changes: 1 addition & 1 deletion examples/provision/extra-large-ha.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2021.7.0",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
"replica_host": "pe-master-1830cd-1.us-west1-b.c.reidmv-peadm.internal",
"primary_postgresql_host": "pe-psql-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
Expand Down
2 changes: 1 addition & 1 deletion examples/provision/extra-large.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2021.7.0",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",

"primary_postgresql_host": "pe-psql-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
Expand Down
2 changes: 1 addition & 1 deletion examples/provision/large-ha.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2021.7.0",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
"replica_host": "pe-master-1830cd-1.us-west1-b.c.reidmv-peadm.internal",

Expand Down
2 changes: 1 addition & 1 deletion examples/provision/large.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2021.7.0",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",


Expand Down
2 changes: 1 addition & 1 deletion examples/provision/minimal.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2021.7.0",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal"
}
2 changes: 1 addition & 1 deletion examples/provision/standard-ha.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2021.7.0",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",
"replica_host": "pe-master-1830cd-1.us-west1-b.c.reidmv-peadm.internal",

Expand Down
2 changes: 1 addition & 1 deletion examples/provision/standard.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "2021.7.0",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"primary_host": "pe-master-1830cd-0.us-west1-a.c.reidmv-peadm.internal",


Expand Down
2 changes: 1 addition & 1 deletion functions/assert_supported_pe_version.pp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function peadm::assert_supported_pe_version (
Boolean $permit_unsafe_versions = false,
) >> Struct[{ 'supported' => Boolean }] {
$oldest = '2019.7'
$newest = '2023.6'
$newest = '2023.7'
$supported = ($version =~ SemVerRange(">= ${oldest} <= ${newest}"))

if $permit_unsafe_versions {
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "puppetlabs-peadm",
"version": "3.18.1",
"version": "3.19.0",
"author": "puppetlabs",
"summary": "Bolt plans used to deploy an at-scale Puppet Enterprise architecture",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion plans/install.pp
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

# Common Configuration
String $console_password,
Peadm::Pe_version $version = '2021.7.7',
Peadm::Pe_version $version = '2021.7.8',
Optional[String] $pe_installer_source = undef,
Optional[Array[String]] $dns_alt_names = undef,
Optional[String] $compiler_pool_address = undef,
Expand Down
14 changes: 7 additions & 7 deletions spec/acceptance/peadm_spec/plans/install_test_cluster.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}

$common_params = {
console_password => 'puppetlabs',
console_password => 'puppetLabs123!',
download_mode => $download_mode,
code_manager_auto_configure => $code_manager_auto_configure,
version => $version,
Expand All @@ -35,28 +35,28 @@

$arch_params =
case $architecture {
'standard': { {
'standard': {{
primary_host => $t.filter |$n| { $n.vars['role'] == 'primary' },
} }
'standard-with-dr': { {
'standard-with-dr': {{
primary_host => $t.filter |$n| { $n.vars['role'] == 'primary' },
replica_host => $t.filter |$n| { $n.vars['role'] == 'replica' },
} }
'large': { {
'large': {{
primary_host => $t.filter |$n| { $n.vars['role'] == 'primary' },
compiler_hosts => $t.filter |$n| { $n.vars['role'] == 'compiler' },
} }
'large-with-dr': { {
'large-with-dr': {{
primary_host => $t.filter |$n| { $n.vars['role'] == 'primary' },
replica_host => $t.filter |$n| { $n.vars['role'] == 'replica' },
compiler_hosts => $t.filter |$n| { $n.vars['role'] == 'compiler' },
} }
'extra-large': { {
'extra-large': {{
primary_host => $t.filter |$n| { $n.vars['role'] == 'primary' },
primary_postgresql_host => $t.filter |$n| { $n.vars['role'] == 'primary-pdb-postgresql' },
compiler_hosts => $t.filter |$n| { $n.vars['role'] == 'compiler' },
} }
'extra-large-with-dr': { {
'extra-large-with-dr': {{
primary_host => $t.filter |$n| { $n.vars['role'] == 'primary' },
primary_postgresql_host => $t.filter |$n| { $n.vars['role'] == 'primary-pdb-postgresql' },
replica_host => $t.filter |$n| { $n.vars['role'] == 'replica' },
Expand Down
2 changes: 1 addition & 1 deletion spec/docker/extra-large-ha/params.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"compiler_hosts": [
"pe-xl-compiler-0.puppet.vm"
],
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"dns_alt_names": [
"puppet",
"pe-xl-core-0.puppet.vm",
Expand Down
2 changes: 1 addition & 1 deletion spec/docker/extra-large/params.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"compiler_hosts": [
"pe-xl-compiler-0.puppet.vm"
],
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"dns_alt_names": [
"puppet",
"pe-xl-core-0.puppet.vm"
Expand Down
2 changes: 1 addition & 1 deletion spec/docker/large-ha/params.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"compiler_hosts": [
"pe-lg-compiler-0.puppet.vm"
],
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"dns_alt_names": [
"puppet",
"pe-lg.puppet.vm"
Expand Down
2 changes: 1 addition & 1 deletion spec/docker/large/params.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"compiler_hosts": [
"pe-lg-compiler-0.puppet.vm"
],
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"dns_alt_names": [
"puppet",
"pe-lg.puppet.vm"
Expand Down
2 changes: 1 addition & 1 deletion spec/docker/standard-ha/params.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"primary_host": "pe-std.puppet.vm",
"replica_host": "pe-std-replica.puppet.vm",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"dns_alt_names": [
"puppet",
"pe-std.puppet.vm"
Expand Down
2 changes: 1 addition & 1 deletion spec/docker/standard/params.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"primary_host": "pe-std.puppet.vm",
"console_password": "puppetlabs",
"console_password": "puppetLabs123!",
"dns_alt_names": [
"puppet",
"pe-std.puppet.vm"
Expand Down
2 changes: 1 addition & 1 deletion spec/functions/assert_supported_pe_version_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
end

it 'accepts the newest supported version' do
is_expected.to run.with_params('2021.7.7').and_return({ 'supported' => true })
is_expected.to run.with_params('2021.7.8').and_return({ 'supported' => true })
end

it 'accepts a version in the middle' do
Expand Down
2 changes: 1 addition & 1 deletion spec/plans/convert_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
allow_apply

expect_task('peadm::cert_data').return_for_targets('primary' => trustedjson)
expect_task('peadm::read_file').always_return({ 'content' => '2021.7.7' })
expect_task('peadm::read_file').always_return({ 'content' => '2021.7.8' })

# For some reason, expect_plan() was not working??
allow_plan('peadm::modify_certificate').always_return({})
Expand Down
2 changes: 1 addition & 1 deletion spec/plans/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
it 'runs successfully with the minimum required parameters' do
expect_plan('peadm::subplans::install')
expect_plan('peadm::subplans::configure')
expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetlabs', 'version' => '2021.7.7')).to be_ok
expect(run_plan('peadm::install', 'primary_host' => 'primary', 'console_password' => 'puppetLabs123!', 'version' => '2021.7.8')).to be_ok
end
end
end
6 changes: 3 additions & 3 deletions spec/plans/subplans/install_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
it 'minimum variables to run' do
params = {
'primary_host' => 'primary',
'console_password' => 'puppetlabs',
'console_password' => 'puppetLabs123!',
'version' => '2019.8.12',
}

Expand All @@ -50,7 +50,7 @@
it 'installs 2023.4 without r10k_known_hosts' do
params = {
'primary_host' => 'primary',
'console_password' => 'puppetlabs',
'console_password' => 'puppetLabs123!',
'version' => '2023.4.0',
'r10k_remote' => 'git@github.com:puppetlabs/nothing',
'r10k_private_key_content' => '-----BEGINfoo',
Expand All @@ -62,7 +62,7 @@
it 'installs 2023.4+ with r10k_private_key and r10k_known_hosts' do
params = {
'primary_host' => 'primary',
'console_password' => 'puppetlabs',
'console_password' => 'puppetLabs123!',
'version' => '2023.4.0',
'r10k_remote' => 'git@github.com:puppetlabs/nothing',
'r10k_private_key_content' => '-----BEGINfoo',
Expand Down
Loading