unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
Conversation 0 Commits 449 Files Changed 291 +8
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f8faad3ed6 - Show all commits

2
site/profiles/manifests/puppet/puppetmaster.pp
View File

@ -58,5 +58,7 @@ class profiles::puppet::puppetmaster (
default_environment => 'develop', default_environment => 'develop',
storeconfigs => true, storeconfigs => true,
storeconfigs_backend => 'puppetdb', storeconfigs_backend => 'puppetdb',
reports => 'puppetdb',
usecacheonfailure => false,
} }
} }

4
site/profiles/manifests/puppet/server.pp
View File

@ -29,6 +29,8 @@ class profiles::puppet::server (
String $default_environment, String $default_environment,
Boolean $storeconfigs, Boolean $storeconfigs,
String $storeconfigs_backend, String $storeconfigs_backend,
String $reports,
Boolean $usecacheonfailure,
) { ) {
file { '/etc/puppetlabs/puppet/puppet.conf': file { '/etc/puppetlabs/puppet/puppet.conf':
@ -51,6 +53,8 @@ class profiles::puppet::server (
'default_environment' => $default_environment, 'default_environment' => $default_environment,
'storeconfigs' => $storeconfigs, 'storeconfigs' => $storeconfigs,
'storeconfigs_backend' => $storeconfigs_backend, 'storeconfigs_backend' => $storeconfigs_backend,
'reports' => $reports,
'usecacheonfailure' => $usecacheonfailure,
}), }),
notify => Service['puppetserver'], notify => Service['puppetserver'],
} }

2
site/profiles/templates/puppet/server/puppet.conf.epp
View File

@ -19,3 +19,5 @@ default_manifest = <%= $default_manifest %>
default_environment = <%= $default_environment %> default_environment = <%= $default_environment %>
storeconfigs = <%= $storeconfigs %> storeconfigs = <%= $storeconfigs %>
storeconfigs_backend = <%= $storeconfigs_backend %> storeconfigs_backend = <%= $storeconfigs_backend %>
reports = <%= $reports %>
usecacheonfailure = <%= $usecacheonfailure %>