File tree Expand file tree Collapse file tree 2 files changed +26
-1
lines changed
templates/server/puppetserver/conf.d Expand file tree Collapse file tree 2 files changed +26
-1
lines changed Original file line number Diff line number Diff line change 426426 end
427427 end
428428
429+ describe 'puppetlabs v4 catalog for services' do
430+ context 'when server_puppetserver_version >= 6.3' do
431+ let ( :params ) { super ( ) . merge ( server_puppetserver_version : '6.3.0' ) }
432+ it { should contain_file ( auth_conf ) . with_content ( %r{^(\ *)path: "\^ /puppet/v4/catalog/\? \$ "$} ) }
433+ end
434+
435+ context 'when server_puppetserver_version < 6.3' do
436+ let ( :params ) { super ( ) . merge ( server_puppetserver_version : '6.2.0' ) }
437+ it { should contain_file ( auth_conf ) . without_content ( %r{^(\ *)path: "\^ /puppet/v4/catalog/\? \$ "$} ) }
438+ end
439+ end
440+
429441 describe 'when server_puppetserver_version < 5.3.6' do
430442 let ( :params ) { super ( ) . merge ( server_puppetserver_version : '5.3.5' ) }
431443 it { should raise_error ( Puppet ::Error , /puppetserver <5.3.6 is not supported by this module version/ ) }
Original file line number Diff line number Diff line change @@ -14,8 +14,21 @@ authorization: {
1414 }
1515 allow: <%= @server_trusted_agents << '$1' %>
1616 sort-order: 500
17- name: "puppetlabs catalog"
17+ name: "puppetlabs v3 catalog from agents "
1818 },
19+ <%- if scope.function_versioncmp([@server_puppetserver_version, '6.3.0']) >= 0 -%>
20+ {
21+ # Allow services to retrieve catalogs on behalf of others
22+ match-request: {
23+ path: "^/puppet/v4/catalog/?$"
24+ type: regex
25+ method: post
26+ }
27+ deny: "*"
28+ sort-order: 500
29+ name: "puppetlabs v4 catalog for services"
30+ },
31+ <%- end -%>
1932 {
2033 # Allow nodes to retrieve the certificate they requested earlier
2134 match-request: {
You can’t perform that action at this time.
0 commit comments