From 09c8eaf304d1075980d8d9143545f2f16a1db34d Mon Sep 17 00:00:00 2001 From: mh Date: Tue, 5 Jun 2012 18:59:39 -0300 Subject: new style for 2.7 --- manifests/master.pp | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 manifests/master.pp (limited to 'manifests/master.pp') diff --git a/manifests/master.pp b/manifests/master.pp new file mode 100644 index 0000000..5ca0acc --- /dev/null +++ b/manifests/master.pp @@ -0,0 +1,73 @@ +# manifests/puppetmaster.pp +class puppet::master( + $config = hiera('puppet_config','/etc/puppet/puppet.conf'), + $http_compression = hiera('puppet_http_compression',false), + $cleanup_clientbucket = hiera('puppet_cleanup_clientbucket',false), + $cron_time = hiera('puppet_cron_time',false), + $ensure_version = hiera('puppet_ensure_version', 'installed'), + $ensure_facter_version = hiera('puppet_ensure_facter_version', 'installed'), + $lastruncheck_cron = hiera('puppet_master_lastruncheck_cron','40 10 * * *'), + $lastruncheck_ignorehosts = hiera('puppet_master_lastruncheck_ignorehosts',''), + $lastruncheck_timeout = hiera('puppet_master_lastruncheck_timeout',''), + $lastruncheck_additionaloptions = hiera('puppet_master_lastruncheck_additionaloptions',''), + $mode = hiera('puppet_master_mode','webrick'), + $cleanup_reports = hiera('puppet_master_cleanup_reports','30'), + $reports_dir = hiera('puppet_master_reports_dir','/var/lib/puppet/reports'), +) { + if $cron_time { + class{'puppet::cron': + config => $config, + http_compression => $http_compression, + cleanup_clientbucket => $cleanup_clientbucket, + cron_time => $cron_time, + ensure_version => $ensure_version, + ensure_facter_version => $ensure_facter_version, + } + } else { + class{'puppet': + config => $config, + http_compression => $http_compression, + cleanup_clientbucket => $cleanup_clientbucket, + ensure_version => $ensure_version, + ensure_facter_version => $ensure_facter_version, + } + } + case $::operatingsystem { + debian: { include puppet::master::debian } + centos: { include puppet::master::centos } + default: { + case $::kernel { + linux: { include puppet::master::linux } + } + } + } + + include puppet::master::base + + + if $puppet::master::lastruncheck_cron { + include puppet::master::checklastrun + } else { + include puppet::master::checklastrun::disable + } + + if $puppet::master::mode == 'passenger' { + include puppet::master::passenger + } elsif $puppet::master::mode == 'cluster' { + include puppet::master::cluster + } + + if $puppet::master::cleanup_reports { + include puppet::master::cleanup_reports + } else { + include puppet::master::cleanup_reports::disable + } + + if hiera('use_shorewall',false) { + include shorewall::rules::puppet::master + } + + if hiera('use_munin',false) { + include puppet::master::munin + } +} -- cgit v1.2.3 From a83290235e9da22d05de814b22e265f53a0dc6bb Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 10 Jun 2012 16:20:01 -0300 Subject: use proper variable name --- manifests/master.pp | 1 + 1 file changed, 1 insertion(+) (limited to 'manifests/master.pp') diff --git a/manifests/master.pp b/manifests/master.pp index 5ca0acc..2e3029f 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -1,6 +1,7 @@ # manifests/puppetmaster.pp class puppet::master( $config = hiera('puppet_config','/etc/puppet/puppet.conf'), + $fileserver = hiera('puppet_fileserver_config','/etc/puppet/fileserver.conf'), $http_compression = hiera('puppet_http_compression',false), $cleanup_clientbucket = hiera('puppet_cleanup_clientbucket',false), $cron_time = hiera('puppet_cron_time',false), -- cgit v1.2.3 From e59aec0fadd435cff42dceeb147d4eb85fdc9484 Mon Sep 17 00:00:00 2001 From: mh Date: Wed, 13 Jun 2012 21:23:36 -0300 Subject: take hiera out of the params --- manifests/master.pp | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) (limited to 'manifests/master.pp') diff --git a/manifests/master.pp b/manifests/master.pp index 2e3029f..7209778 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -1,19 +1,20 @@ # manifests/puppetmaster.pp class puppet::master( - $config = hiera('puppet_config','/etc/puppet/puppet.conf'), - $fileserver = hiera('puppet_fileserver_config','/etc/puppet/fileserver.conf'), - $http_compression = hiera('puppet_http_compression',false), - $cleanup_clientbucket = hiera('puppet_cleanup_clientbucket',false), - $cron_time = hiera('puppet_cron_time',false), - $ensure_version = hiera('puppet_ensure_version', 'installed'), - $ensure_facter_version = hiera('puppet_ensure_facter_version', 'installed'), - $lastruncheck_cron = hiera('puppet_master_lastruncheck_cron','40 10 * * *'), - $lastruncheck_ignorehosts = hiera('puppet_master_lastruncheck_ignorehosts',''), - $lastruncheck_timeout = hiera('puppet_master_lastruncheck_timeout',''), - $lastruncheck_additionaloptions = hiera('puppet_master_lastruncheck_additionaloptions',''), - $mode = hiera('puppet_master_mode','webrick'), - $cleanup_reports = hiera('puppet_master_cleanup_reports','30'), - $reports_dir = hiera('puppet_master_reports_dir','/var/lib/puppet/reports'), + $config = '/etc/puppet/puppet.conf', + $fileserver = '/etc/puppet/fileserver.conf', + $http_compression = false, + $cleanup_clientbucket = false, + $cron_time = false, + $ensure_version = 'installed', + $ensure_facter_version = 'installed', + $lastruncheck_cron = '40 10 * * *', + $lastruncheck_ignorehosts = '', + $lastruncheck_timeout = '', + $lastruncheck_additionaloptions = '', + $mode = 'webrick', + $cleanup_reports = '30', + $reports_dir = '/var/lib/puppet/reports', + $manage_shorewall = false ) { if $cron_time { class{'puppet::cron': @@ -23,6 +24,7 @@ class puppet::master( cron_time => $cron_time, ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, + manage_shorewall => $manage_shorewall, } } else { class{'puppet': @@ -31,6 +33,7 @@ class puppet::master( cleanup_clientbucket => $cleanup_clientbucket, ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, + manage_shorewall => $manage_shorewall, } } case $::operatingsystem { @@ -64,11 +67,15 @@ class puppet::master( include puppet::master::cleanup_reports::disable } - if hiera('use_shorewall',false) { - include shorewall::rules::puppet::master + if $manage_shorewall { + class{'shorewall::rules::puppet::master': + puppetserver => $puppetserver, + puppetserver_port => $puppetserver_port, + puppetserver_signport => $puppetserver_signport, + } } - if hiera('use_munin',false) { + if $manage_munin { include puppet::master::munin } } -- cgit v1.2.3 From 1abec7ab73695e5c2e6a091f9355bcc04d25fa3b Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 17 Jun 2012 17:02:37 -0300 Subject: pass also these params --- manifests/master.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'manifests/master.pp') diff --git a/manifests/master.pp b/manifests/master.pp index 7209778..1a463c7 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -14,7 +14,10 @@ class puppet::master( $mode = 'webrick', $cleanup_reports = '30', $reports_dir = '/var/lib/puppet/reports', - $manage_shorewall = false + $manage_shorewall = false, + $shorewall_puppetmaster = "domain.${::domain}", + $shorewall_puppetmaster_port = 8140, + $shorewall_puppetmaster_signport = 8141 ) { if $cron_time { class{'puppet::cron': @@ -25,6 +28,9 @@ class puppet::master( ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, manage_shorewall => $manage_shorewall, + shorewall_puppetmaster => $shorewall_puppetmaster, + shorewall_puppetmaster_port => $shorewall_puppetmaster_port, + shorewall_puppetmaster_signport => $shorewall_puppetmaster_signport, } } else { class{'puppet': -- cgit v1.2.3 From 31f7bbcae199de9d35daaa7c2d47aac5d0567e65 Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 18 Jun 2012 14:56:59 -0300 Subject: cleanup param mes --- manifests/master.pp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'manifests/master.pp') diff --git a/manifests/master.pp b/manifests/master.pp index 1a463c7..55ab1e5 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -14,10 +14,10 @@ class puppet::master( $mode = 'webrick', $cleanup_reports = '30', $reports_dir = '/var/lib/puppet/reports', - $manage_shorewall = false, $shorewall_puppetmaster = "domain.${::domain}", $shorewall_puppetmaster_port = 8140, - $shorewall_puppetmaster_signport = 8141 + $shorewall_puppetmaster_signport = 8141, + $manage_munin = false ) { if $cron_time { class{'puppet::cron': @@ -27,7 +27,6 @@ class puppet::master( cron_time => $cron_time, ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, - manage_shorewall => $manage_shorewall, shorewall_puppetmaster => $shorewall_puppetmaster, shorewall_puppetmaster_port => $shorewall_puppetmaster_port, shorewall_puppetmaster_signport => $shorewall_puppetmaster_signport, @@ -39,7 +38,6 @@ class puppet::master( cleanup_clientbucket => $cleanup_clientbucket, ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, - manage_shorewall => $manage_shorewall, } } case $::operatingsystem { @@ -73,11 +71,11 @@ class puppet::master( include puppet::master::cleanup_reports::disable } - if $manage_shorewall { + if $shorewall_puppetmaster { class{'shorewall::rules::puppet::master': - puppetserver => $puppetserver, - puppetserver_port => $puppetserver_port, - puppetserver_signport => $puppetserver_signport, + puppetserver => $shorewall_puppetmaster, + puppetserver_port => $shorewall_puppetmaster_port, + puppetserver_signport => $shorewall_puppetmaster_signport, } } -- cgit v1.2.3 From 32d3fa901b91a7814397965fd2b2eb01d30ad99a Mon Sep 17 00:00:00 2001 From: mh Date: Mon, 18 Jun 2012 15:23:57 -0300 Subject: this has no params --- manifests/master.pp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'manifests/master.pp') diff --git a/manifests/master.pp b/manifests/master.pp index 55ab1e5..af7794b 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -72,11 +72,7 @@ class puppet::master( } if $shorewall_puppetmaster { - class{'shorewall::rules::puppet::master': - puppetserver => $shorewall_puppetmaster, - puppetserver_port => $shorewall_puppetmaster_port, - puppetserver_signport => $shorewall_puppetmaster_signport, - } + include shorewall::rules::puppet::master } if $manage_munin { -- cgit v1.2.3 From 8db4cf07c117d62c92b6ff2c46948e7fc4b74c2e Mon Sep 17 00:00:00 2001 From: mh Date: Thu, 5 Dec 2013 11:49:56 +0100 Subject: make it possible to pass the content of the config from outside --- manifests/master.pp | 62 +++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'manifests/master.pp') diff --git a/manifests/master.pp b/manifests/master.pp index af7794b..efff8e9 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -1,42 +1,44 @@ # manifests/puppetmaster.pp class puppet::master( - $config = '/etc/puppet/puppet.conf', - $fileserver = '/etc/puppet/fileserver.conf', - $http_compression = false, - $cleanup_clientbucket = false, - $cron_time = false, - $ensure_version = 'installed', - $ensure_facter_version = 'installed', - $lastruncheck_cron = '40 10 * * *', - $lastruncheck_ignorehosts = '', - $lastruncheck_timeout = '', - $lastruncheck_additionaloptions = '', - $mode = 'webrick', - $cleanup_reports = '30', - $reports_dir = '/var/lib/puppet/reports', - $shorewall_puppetmaster = "domain.${::domain}", - $shorewall_puppetmaster_port = 8140, - $shorewall_puppetmaster_signport = 8141, - $manage_munin = false + $config = '/etc/puppet/puppet.conf', + $config_content = false, + $fileserver = '/etc/puppet/fileserver.conf', + $http_compression = false, + $cleanup_clientbucket = false, + $cron_time = false, + $ensure_version = 'installed', + $ensure_facter_version = 'installed', + $lastruncheck_cron = '40 10 * * *', + $lastruncheck_ignorehosts = '', + $lastruncheck_timeout = '', + $lastruncheck_additionaloptions = '', + $mode = 'webrick', + $cleanup_reports = '30', + $reports_dir = '/var/lib/puppet/reports', + $shorewall_puppetmaster = "domain.${::domain}", + $shorewall_puppetmaster_port = 8140, + $shorewall_puppetmaster_signport = 8141, + $manage_munin = false ) { if $cron_time { class{'puppet::cron': - config => $config, - http_compression => $http_compression, - cleanup_clientbucket => $cleanup_clientbucket, - cron_time => $cron_time, - ensure_version => $ensure_version, - ensure_facter_version => $ensure_facter_version, - shorewall_puppetmaster => $shorewall_puppetmaster, - shorewall_puppetmaster_port => $shorewall_puppetmaster_port, + config => $config, + config_content => $config_content, + http_compression => $http_compression, + cleanup_clientbucket => $cleanup_clientbucket, + cron_time => $cron_time, + ensure_version => $ensure_version, + ensure_facter_version => $ensure_facter_version, + shorewall_puppetmaster => $shorewall_puppetmaster, + shorewall_puppetmaster_port => $shorewall_puppetmaster_port, shorewall_puppetmaster_signport => $shorewall_puppetmaster_signport, } } else { class{'puppet': - config => $config, - http_compression => $http_compression, - cleanup_clientbucket => $cleanup_clientbucket, - ensure_version => $ensure_version, + config => $config, + http_compression => $http_compression, + cleanup_clientbucket => $cleanup_clientbucket, + ensure_version => $ensure_version, ensure_facter_version => $ensure_facter_version, } } -- cgit v1.2.3