Skip to content

Commit

Permalink
(MAINT) CI fix, PE console requires a minimum password of 12 characte…
Browse files Browse the repository at this point in the history
…rs (#436)
  • Loading branch information
CoMfUcIoS committed May 8, 2024
1 parent a99cb66 commit 1134652
Show file tree
Hide file tree
Showing 16 changed files with 24 additions and 24 deletions.
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
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/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.7')).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

0 comments on commit 1134652

Please sign in to comment.