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 +37 -16
2 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a429255c63 - Show all commits

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

@ -15,25 +15,32 @@
# autosign - Path to the autosign script. # autosign - Path to the autosign script.
# #
class profiles::puppet::server ( class profiles::puppet::server (
Stdlib::Absolutepath $vardir = '/opt/puppetlabs/server/data/puppetserver', Stdlib::Absolutepath $vardir = '/opt/puppetlabs/server/data/puppetserver',
Stdlib::Absolutepath $logdir = '/var/log/puppetlabs/puppetserver', Stdlib::Absolutepath $logdir = '/var/log/puppetlabs/puppetserver',
Stdlib::Absolutepath $rundir = '/var/run/puppetlabs/puppetserver', Stdlib::Absolutepath $rundir = '/var/run/puppetlabs/puppetserver',
Stdlib::Absolutepath $pidfile = '/var/run/puppetlabs/puppetserver/puppetserver.pid', Stdlib::Absolutepath $pidfile = '/var/run/puppetlabs/puppetserver/puppetserver.pid',
Stdlib::Absolutepath $codedir = '/etc/puppetlabs/code', Stdlib::Absolutepath $codedir = '/etc/puppetlabs/code',
Array[String] $dns_alt_names = [ Array[String] $dns_alt_names = [
$facts['networking']['fqdn'], $facts['networking']['fqdn'],
$facts['networking']['hostname'], $facts['networking']['hostname'],
], ],
Stdlib::Fqdn $agent_server = 'puppetmaster', Stdlib::Fqdn $agent_server = 'puppetmaster',
String $node_terminus = 'exec', Stdlib::Fqdn $report_server = $agent_server,
String $external_nodes = '/opt/cobbler-enc/cobbler-enc', Stdlib::Fqdn $ca_server = 'puppetca',
String $default_environment = 'develop', String $node_terminus = 'exec',
Stdlib::Absolutepath $autosign = '/etc/puppetlabs/puppet/autosign.conf', String $external_nodes = '/opt/cobbler-enc/cobbler-enc',
String $default_environment = 'develop',
String $environment = 'develop',
Stdlib::Absolutepath $autosign = '/etc/puppetlabs/puppet/autosign.conf',
Stdlib::Absolutepath $default_manifest = "${codedir}/environments/${default_environment}/manifests", Stdlib::Absolutepath $default_manifest = "${codedir}/environments/${default_environment}/manifests",
Boolean $storeconfigs = true, String $reports = 'puppetdb',
String $storeconfigs_backend = 'puppetdb', Boolean $storeconfigs = true,
String $reports = 'puppetdb', String $storeconfigs_backend = 'puppetdb',
Boolean $usecacheonfailure = false, Boolean $usecacheonfailure = false,
Boolean $report = true,
Integer $runinterval = 1800,
Integer $runtimeout = 3600,
Boolean $show_diff = true,
) { ) {
file { '/etc/puppetlabs/puppet/puppet.conf': file { '/etc/puppetlabs/puppet/puppet.conf':
@ -49,6 +56,13 @@ class profiles::puppet::server (
'codedir' => $codedir, 'codedir' => $codedir,
'dns_alt_names' => join(sort($dns_alt_names), ','), 'dns_alt_names' => join(sort($dns_alt_names), ','),
'server' => $agent_server, 'server' => $agent_server,
'ca_server' => $ca_server,
'environment' => $environment,
'report' => $report,
'runinterval' => $runinterval,
'runtimeout' => $runtimeout,
'show_diff' => $show_diff,
'report_server' => $report_server,
'node_terminus' => $node_terminus, 'node_terminus' => $node_terminus,
'external_nodes' => $external_nodes, 'external_nodes' => $external_nodes,
'autosign' => $autosign, 'autosign' => $autosign,

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

@ -10,9 +10,16 @@ dns_alt_names = <%= $dns_alt_names %>
[agent] [agent]
server = <%= $server %> server = <%= $server %>
ca_server = <%= $ca_server %>
environment = <%= $environment %>
report = <%= $report %>
report_server = <%= $report_server %>
runinterval = <%= $runinterval %>
runtimeout = <%= $runtimeout %>
show_diff = <%= $show_diff %>
[master] [master]
node_terminus = exec node_terminus = <%= $node_terminus %>
external_nodes = <%= $external_nodes %> external_nodes = <%= $external_nodes %>
autosign = <%= $autosign %> autosign = <%= $autosign %>
default_manifest = <%= $default_manifest %> default_manifest = <%= $default_manifest %>