Skip to content

Commit

Permalink
(PE-39577) Optimise legacy compiler support
Browse files Browse the repository at this point in the history 
This commit:
- Adds the `node_group_unpin` task.
- `node_group_unpin` task is called in the convert plan to remove
  legacy compilers from from the PE Master node group.
- Legacy compilers `pp_auth_role` changed to `legacy_compiler`.
- Changes the PEADM config to use the PE Certificate Authority node group.
- Removes peadm_legacy_compiler extension.
  • Loading branch information
petergmurphy committed Jan 30, 2025
1 parent 26c3ddf commit e372ad3
Show file tree
Hide file tree
Showing 12 changed files with 198 additions and 76 deletions.
59 changes: 29 additions & 30 deletions manifests/setup/legacy_compiler_group.pp
View file
Original file line number Diff line number Diff line change
@@ -1,72 +1,71 @@
# @api private
class peadm::setup::legacy_compiler_group (
String[1] $primary_host,
Optional[String] $internal_compiler_a_pool_address = undef,
Optional[String] $internal_compiler_b_pool_address = undef,
Optional[String] $internal_compiler_a_pool_address = undef,
Optional[String] $internal_compiler_b_pool_address = undef,
) {
Node_group {
purge_behavior => none,
}

node_group { 'PE Legacy Compiler':
parent => 'PE Master',
rule => ['and',
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'true'],
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
],
classes => {
'puppet_enterprise::profile::master' => {
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
'puppetdb_port' => [8081],
ensure => 'present',
parent => 'PE Master',
purge_behavior => 'classes',
rule => ['=', ['trusted', 'extensions', 'pp_auth_role'], 'legacy_compiler'],
classes => {
'puppet_enterprise::profile::master' => {
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
'puppetdb_port' => [8081],
'replication_mode' => 'none',
'code_manager_auto_configure' => true,
},
},
}

node_group { 'PE Legacy Compiler Group A':
ensure => 'present',
parent => 'PE Legacy Compiler',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
ensure => 'present',
parent => 'PE Legacy Compiler',
purge_behavior => 'classes',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'legacy_compiler'],
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'A'],
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'true'],
],
classes => {
'puppet_enterprise::profile::master' => {
classes => {
'puppet_enterprise::profile::master' => {
'puppetdb_host' => [$internal_compiler_b_pool_address, $internal_compiler_a_pool_address].filter |$_| { $_ },
'puppetdb_port' => [8081],
},
},
data => {
# Workaround for GH-118
data => {
'puppet_enterprise::profile::master::puppetdb' => {
'ha_enabled_replicas' => [],
},
},
}

node_group { 'PE Legacy Compiler Group B':
ensure => 'present',
parent => 'PE Legacy Compiler',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
ensure => 'present',
parent => 'PE Legacy Compiler',
purge_behavior => 'classes',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'legacy_compiler'],
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'B'],
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'true'],
],
classes => {
'puppet_enterprise::profile::master' => {
classes => {
'puppet_enterprise::profile::master' => {
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
'puppetdb_port' => [8081],
},
},
data => {
# Workaround for GH-118
data => {
'puppet_enterprise::profile::master::puppetdb' => {
'ha_enabled_replicas' => [],
},
},
}

node_group { 'PE Compiler':
rule => ['and', ['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'false']],
rule => ['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
}
}
19 changes: 8 additions & 11 deletions manifests/setup/node_manager.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,16 @@
parent => 'PE Infrastructure',
data => $compiler_pool_address_data,
variables => { 'pe_master' => true },
rule => ['or',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'legacy_compiler'],
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
],
}

# PE Compiler group comes from default PE and already has the pe compiler role
node_group { 'PE Compiler':
parent => 'PE Master',
rule => ['and', ['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'false']],
rule => ['and', ['=', ['trusted', 'extensions', peadm::oid('pp_auth_role')], 'pe_compiler']],
}

# This group should pin the primary, and also map to any pe-postgresql nodes
Expand Down Expand Up @@ -121,7 +125,6 @@
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'A'],
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'false'],
],
classes => {
'puppet_enterprise::profile::puppetdb' => {
Expand Down Expand Up @@ -180,7 +183,6 @@
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'B'],
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'false'],
],
classes => {
'puppet_enterprise::profile::puppetdb' => {
Expand All @@ -203,10 +205,7 @@

node_group { 'PE Legacy Compiler':
parent => 'PE Master',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'true'],
],
rule => ['=', ['trusted', 'extensions', 'pp_auth_role'], 'legacy_compiler'],
classes => {
'puppet_enterprise::profile::master' => {
'puppetdb_host' => [$internal_compiler_a_pool_address, $internal_compiler_b_pool_address].filter |$_| { $_ },
Expand All @@ -221,9 +220,8 @@
ensure => 'present',
parent => 'PE Legacy Compiler',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
['=', ['trusted', 'extensions', 'pp_auth_role'], 'legacy_compiler'],
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'A'],
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'true'],
],
classes => {
'puppet_enterprise::profile::master' => {
Expand All @@ -245,9 +243,8 @@
ensure => 'present',
parent => 'PE Legacy Compiler',
rule => ['and',
['=', ['trusted', 'extensions', 'pp_auth_role'], 'pe_compiler'],
['=', ['trusted', 'extensions', 'pp_auth_role'], 'legacy_compiler'],
['=', ['trusted', 'extensions', peadm::oid('peadm_availability_group')], 'B'],
['=', ['trusted', 'extensions', peadm::oid('peadm_legacy_compiler')], 'true'],
],
classes => {
'puppet_enterprise::profile::master' => {
Expand Down
18 changes: 12 additions & 6 deletions plans/convert.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@
add_extensions => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('peadm_availability_group') => 'A',
peadm::oid('peadm_legacy_compiler') => 'false',
},
)
},
Expand All @@ -224,27 +223,24 @@
add_extensions => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('peadm_availability_group') => 'B',
peadm::oid('peadm_legacy_compiler') => 'false',
},
)
},
background('modify-compilers-a-certs') || {
run_plan('peadm::modify_certificate', $legacy_compiler_a_targets,
primary_host => $primary_target,
add_extensions => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('pp_auth_role') => 'legacy_compiler',
peadm::oid('peadm_availability_group') => 'A',
peadm::oid('peadm_legacy_compiler') => 'true',
},
)
},
background('modify-compilers-b-certs') || {
run_plan('peadm::modify_certificate', $legacy_compiler_b_targets,
primary_host => $primary_target,
add_extensions => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('pp_auth_role') => 'legacy_compiler',
peadm::oid('peadm_availability_group') => 'B',
peadm::oid('peadm_legacy_compiler') => 'true',
},
)
},
Expand Down Expand Up @@ -283,6 +279,16 @@
include peadm::setup::convert_node_manager
}
# Unpin legacy compilers from PE Master group
if $legacy_compiler_targets {
$legacy_compiler_targets.each |$target| {
run_task('peadm::node_group_unpin', $primary_target,
node_certname => $target.peadm::certname(),
group_name => 'PE Master',
)
}
}
}
else {
# lint:ignore:strict_indent
Expand Down
8 changes: 3 additions & 5 deletions plans/convert_compiler_to_legacy.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,27 +102,25 @@
run_plan('peadm::modify_certificate', $compiler_targets,
primary_host => $primary_target,
add_extensions => {
peadm::oid('peadm_legacy_compiler') => 'false',
peadm::oid('pp_auth_role') => 'legacy_compiler',
},
)
},
background('modify-compilers-a-certs') || {
run_plan('peadm::modify_certificate', $legacy_compiler_a_targets,
primary_host => $primary_target,
add_extensions => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('pp_auth_role') => 'legacy_compiler',
peadm::oid('peadm_availability_group') => 'A',
peadm::oid('peadm_legacy_compiler') => 'true',
},
)
},
background('modify-compilers-b-certs') || {
run_plan('peadm::modify_certificate', $legacy_compiler_b_targets,
primary_host => $primary_target,
add_extensions => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('pp_auth_role') => 'legacy_compiler',
peadm::oid('peadm_availability_group') => 'B',
peadm::oid('peadm_legacy_compiler') => 'true',
},
)
},
Expand Down
4 changes: 1 addition & 3 deletions plans/subplans/component_install.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,11 @@
$certificate_extensions = {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('peadm_availability_group') => $avail_group_letter,
peadm::oid('peadm_legacy_compiler') => false,
}
} elsif $role == 'pe_compiler_legacy' {
$certificate_extensions = {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('pp_auth_role') => 'legacy_compiler',
peadm::oid('peadm_availability_group') => $avail_group_letter,
peadm::oid('peadm_legacy_compiler') => true,
}
} else {
$certificate_extensions = {
Expand Down
8 changes: 2 additions & 6 deletions plans/subplans/install.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@
extension_requests => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('peadm_availability_group') => 'A',
peadm::oid('peadm_legacy_compiler') => 'false',
}
)
},
Expand All @@ -296,25 +295,22 @@
extension_requests => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('peadm_availability_group') => 'B',
peadm::oid('peadm_legacy_compiler') => 'false',
}
)
},
background('compiler-a-csr.yaml') || {
run_plan('peadm::util::insert_csr_extension_requests', $legacy_a_targets,
extension_requests => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('pp_auth_role') => 'legacy_compiler',
peadm::oid('peadm_availability_group') => 'A',
peadm::oid('peadm_legacy_compiler') => 'true',
}
)
},
background('compiler-b-csr.yaml') || {
run_plan('peadm::util::insert_csr_extension_requests', $legacy_b_targets,
extension_requests => {
peadm::oid('pp_auth_role') => 'pe_compiler',
peadm::oid('pp_auth_role') => 'legacy_compiler',
peadm::oid('peadm_availability_group') => 'B',
peadm::oid('peadm_legacy_compiler') => 'true',
}
)
},
Expand Down
5 changes: 0 additions & 5 deletions plans/update_compiler_extensions.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
$primary_target = peadm::get_targets($primary_host, 1)
$host_targets = peadm::get_targets($compiler_hosts)

run_plan('peadm::modify_certificate', $host_targets,
primary_host => $primary_target,
add_extensions => { peadm::oid('peadm_legacy_compiler') => String($legacy) },
)

run_task('peadm::puppet_runonce', $primary_target)
run_task('peadm::puppet_runonce', $host_targets)

Expand Down
8 changes: 4 additions & 4 deletions plans/upgrade.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@
$compiler_m1_nonlegacy_targets = $compiler_targets.filter |$target| {
($cert_extensions.dig($target.peadm::certname, peadm::oid('peadm_availability_group'))
== $cert_extensions.dig($primary_target[0].peadm::certname, peadm::oid('peadm_availability_group'))) and
($cert_extensions.dig($target.peadm::certname, peadm::oid('peadm_legacy_compiler'))
== 'false')
($cert_extensions.dig($target.peadm::certname, peadm::oid('pp_auth_role'))
== 'pe_compiler')
}

$compiler_m2_targets = $compiler_targets.filter |$target| {
Expand All @@ -184,8 +184,8 @@
$compiler_m2_nonlegacy_targets = $compiler_targets.filter |$target| {
($cert_extensions.dig($target.peadm::certname, peadm::oid('peadm_availability_group'))
== $cert_extensions.dig($replica_target[0].peadm::certname, peadm::oid('peadm_availability_group'))) and
($cert_extensions.dig($target.peadm::certname, peadm::oid('peadm_legacy_compiler'))
== 'false')
($cert_extensions.dig($target.peadm::certname, peadm::oid('pp_auth_role'))
== 'pe_compiler')
}

peadm::plan_step('preparation') || {
Expand Down
3 changes: 2 additions & 1 deletion spec/plans/convert_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
end

let(:params) do
{ 'primary_host' => 'primary' }
{ 'primary_host' => 'primary', 'legacy_compilers' => '[legacy_compiler]' }
end

it 'single primary no dr valid' do

Check failure on line 15 in spec/plans/convert_spec.rb

View workflow job for this annotation

GitHub Actions / Spec / Spec tests (Puppet: ~> 7.24, Ruby Ver: 2.7) 

peadm::convert single primary no dr valid

Failure/Error: expect(run_plan('peadm::convert', params)).to be_ok

RuntimeError:
  Expected peadm::cert_data to be called 1 times
  Plan result: {"kind":"bolt.inventory/wildcard-error","msg":"Found 0 targets matching wildcard pattern [legacy_compiler]","details":{}}
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:70:in `assert_called'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:24:in `block in assert_called'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:24:in `each'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:24:in `assert_called'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:188:in `block (2 levels) in assert_call_expectations'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:187:in `each'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:187:in `map'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:187:in `block in assert_call_expectations'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:186:in `each'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:186:in `assert_call_expectations'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/bolt-4.0.0/lib/bolt_spec/plans.rb:147:in `run_plan'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/spec/plans/convert_spec.rb:29:in `block (2 levels) in <top (required)>'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:263:in `instance_exec'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:263:in `block in run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:511:in `block in with_around_and_singleton_context_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:468:in `block in with_around_example_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/hooks.rb:486:in `block in run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/hooks.rb:624:in `run_around_example_hooks_for'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/hooks.rb:486:in `run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:468:in `with_around_example_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:511:in `with_around_and_singleton_context_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:259:in `run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example_group.rb:646:in `block in run_examples'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/2.7.0/gems/rspec-core-3.13.2/lib/rspec/core/example_group.rb:642:in `map'
  /home/runner/work/puppetlabs-peadm/puppetl

Check failure on line 15 in spec/plans/convert_spec.rb

View workflow job for this annotation

GitHub Actions / Spec / Spec tests (Puppet: ~> 8.0, Ruby Ver: 3.2) 

peadm::convert single primary no dr valid

Failure/Error: expect(run_plan('peadm::convert', params)).to be_ok

RuntimeError:
  Expected peadm::cert_data to be called 1 times
  Plan result: {"kind":"bolt.inventory/wildcard-error","msg":"Found 0 targets matching wildcard pattern [legacy_compiler]","details":{}}
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:70:in `assert_called'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:24:in `block in assert_called'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:24:in `each'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/action_stubs.rb:24:in `assert_called'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:188:in `block (2 levels) in assert_call_expectations'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:187:in `each'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:187:in `map'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:187:in `block in assert_call_expectations'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:186:in `each'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans/mock_executor.rb:186:in `assert_call_expectations'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/bolt-4.0.0/lib/bolt_spec/plans.rb:147:in `run_plan'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/spec/plans/convert_spec.rb:29:in `block (2 levels) in <top (required)>'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:263:in `instance_exec'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:263:in `block in run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:511:in `block in with_around_and_singleton_context_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:468:in `block in with_around_example_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/hooks.rb:486:in `block in run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/hooks.rb:624:in `run_around_example_hooks_for'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/hooks.rb:486:in `run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:468:in `with_around_example_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:511:in `with_around_and_singleton_context_hooks'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example.rb:259:in `run'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example_group.rb:646:in `block in run_examples'
  /home/runner/work/puppetlabs-peadm/puppetlabs-peadm/vendor/bundle/ruby/3.2.0/gems/rspec-core-3.13.2/lib/rspec/core/example_group.rb:642:in `map'
  /home/runner/work/puppetlabs-peadm/puppetl
Expand All @@ -21,6 +21,7 @@
expect_task('peadm::cert_data').return_for_targets('primary' => trustedjson)
expect_task('peadm::read_file').always_return({ 'content' => '2021.7.9' })
expect_task('peadm::get_group_rules').return_for_targets('primary' => { '_output' => '{"rules": []}' })
expect_task('peadm::node_group_unpin').with_targets('primary').with_params({ 'node_certname' => 'legacy_compiler', 'group_name' => 'PE Master' })

# For some reason, expect_plan() was not working??
allow_plan('peadm::modify_certificate').always_return({})
Expand Down
8 changes: 3 additions & 5 deletions tasks/get_peadm_config.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def execute!

def config
# Compute values
primary = groups.pinned('PE Master')
primary = groups.pinned('PE Certificate Authority')
replica = groups.pinned('PE HA Replica')
server_a = server('puppet/server', 'A', [primary, replica].compact)
server_b = server('puppet/server', 'B', [primary, replica].compact)
Expand Down Expand Up @@ -94,8 +94,7 @@ def groups
def compilers
@compilers ||=
pdb_query('inventory[certname,trusted.extensions] {
trusted.extensions.pp_auth_role = "pe_compiler" and
trusted.extensions."1.3.6.1.4.1.34380.1.1.9814" = "false"
trusted.extensions.pp_auth_role = "pe_compiler"
}').map do |c|
{
'certname' => c['certname'],
Expand All @@ -108,8 +107,7 @@ def compilers
def legacy_compilers
@legacy_compilers ||=
pdb_query('inventory[certname,trusted.extensions] {
trusted.extensions.pp_auth_role = "pe_compiler" and
trusted.extensions."1.3.6.1.4.1.34380.1.1.9814" = "true"
trusted.extensions.pp_auth_role = "legacy_compiler"
}').map do |c|
{
'certname' => c['certname'],
Expand Down
Loading

0 comments on commit e372ad3

Please sign in to comment.