@@ -47,6 +47,7 @@ def config
47
47
'primary_postgresql_host' => postgresql [ primary_letter ] ,
48
48
'replica_postgresql_host' => postgresql [ replica_letter ] ,
49
49
'compilers' => compilers . map { |c | c [ 'certname' ] } ,
50
+ 'legacy_compilers' => legacy_compilers . map { |c | c [ 'certname' ] } ,
50
51
'compiler_pool_address' => groups . dig ( 'PE Master' , 'config_data' , 'pe_repo' , 'compile_master_pool_address' ) ,
51
52
'internal_compiler_a_pool_address' => groups . dig ( 'PE Compiler Group B' , 'classes' , 'puppet_enterprise::profile::master' , 'puppetdb_host' , 1 ) ,
52
53
'internal_compiler_b_pool_address' => groups . dig ( 'PE Compiler Group A' , 'classes' , 'puppet_enterprise::profile::master' , 'puppetdb_host' , 1 ) ,
@@ -63,7 +64,11 @@ def config
63
64
'compilers' => {
64
65
'A' => compilers . select { |c | c [ 'letter' ] == 'A' } . map { |c | c [ 'certname' ] } ,
65
66
'B' => compilers . select { |c | c [ 'letter' ] == 'B' } . map { |c | c [ 'certname' ] } ,
66
- }
67
+ } ,
68
+ 'legacy_compilers' => {
69
+ 'A' => legacy_compilers . select { |c | c [ 'letter' ] == 'A' } . map { |c | c [ 'certname' ] } ,
70
+ 'B' => legacy_compilers . select { |c | c [ 'letter' ] == 'B' } . map { |c | c [ 'certname' ] } ,
71
+ } ,
67
72
} ,
68
73
}
69
74
end
@@ -81,7 +86,24 @@ def groups
81
86
# Returns a list of compiler certnames and letters, based on a PuppetDB query
82
87
def compilers
83
88
@compilers ||=
84
- pdb_query ( 'inventory[certname,trusted.extensions] { trusted.extensions.pp_auth_role = "pe_compiler" }' ) . map do |c |
89
+ pdb_query ( 'inventory[certname,trusted.extensions] {
90
+ trusted.extensions.pp_auth_role = "pe_compiler" and
91
+ trusted.extensions."1.3.6.1.4.1.34380.1.1.9814" = "false"
92
+ }' ) . map do |c |
93
+ {
94
+ 'certname' => c [ 'certname' ] ,
95
+ 'letter' => c . dig ( 'trusted.extensions' , '1.3.6.1.4.1.34380.1.1.9813' ) ,
96
+ }
97
+ end
98
+ end
99
+
100
+ # Returns a list of legacy compiler certnames and letters, based on a PuppetDB query
101
+ def legacy_compilers
102
+ @legacy_compilers ||=
103
+ pdb_query ( 'inventory[certname,trusted.extensions] {
104
+ trusted.extensions.pp_auth_role = "pe_compiler" and
105
+ trusted.extensions."1.3.6.1.4.1.34380.1.1.9814" = "true"
106
+ }' ) . map do |c |
85
107
{
86
108
'certname' => c [ 'certname' ] ,
87
109
'letter' => c . dig ( 'trusted.extensions' , '1.3.6.1.4.1.34380.1.1.9813' ) ,
0 commit comments