puppet_modules/puppet
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting

Browse Source
This commit is contained in:
Udo Waechter
2013-05-28 17:09:58 +02:00
parent 9e6215ba3e
commit 24f4a25732
5 changed files with 31 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/common.pp
View File

@@ -27,7 +27,7 @@ class puppet::common ($ensure = 'present') {
} }
# add facter variable to custom facts. # add facter variable to custom facts.
file { "/etc/profile.d/puppet.sh": file { '/etc/profile.d/puppet.sh':
content => "export FACTERLIB=\"${factpath}\"\n", content => "export FACTERLIB=\"${factpath}\"\n",
} }
} }

33
manifests/defines/env_fact.pp
View File

@@ -1,28 +1,23 @@
# $Id: env_fact.pp 2479 2009-05-16 12:02:33Z uwaechte $ define puppet::defines::env_fact ($value, $factname = '', $ensure = 'present') {
define puppet::env_fact(
$factname="",
$value,
$ensure="present"
){
$factname_real = $factname ? { $factname_real = $factname ? {
"" => upcase($name), '' => upcase($name),
default => upcase($factname) default => upcase($factname)
} }
if defined(Exec["create-env_fact.sh"]){
debug("already defined.") if defined(Exec['create-env_fact.sh']) {
}else{ debug('already defined.')
exec{"create-env_fact.sh": } else {
command => "echo \"#/bin/sh\n\" >>/etc/profile.d/env_facts.sh && chmod a+xr /etc/profile.d/env_facts.sh", exec { 'create-env_fact.sh':
onlyif => "test ! -e /etc/profile.d/env_facts.sh", command => 'echo \'#/bin/sh\n\' >>/etc/profile.d/env_facts.sh && chmod a+xr /etc/profile.d/env_facts.sh',
before => Line["env_fact-${factname_real}"], onlyif => 'test ! -e /etc/profile.d/env_facts.sh',
path => ["/usr/bin", "/bin" ], before => Line["env_fact-${factname_real}"],
path => ['/usr/bin', '/bin'],
} }
} }
line{"env_fact-${factname_real}": common::line { "env_fact-${factname_real}":
line => "export FACTER_${factname_real}=${value}", line => "export FACTER_${factname_real}=${value}",
file => "/etc/profile.d/env_facts.sh", file => '/etc/profile.d/env_facts.sh',
ensure => $ensure, ensure => $ensure,
} }
} }

4
manifests/defines/fact_d.pp
View File

@@ -1,4 +1,4 @@
define puppet::defines::fact_d ($ensure = 'present', $key = false, $value) { define puppet::defines::fact_d ($value, $ensure = 'present', $key = false) {
require 'puppet::common' require 'puppet::common'
$k_real = $key ? { $k_real = $key ? {
false => $name, false => $name,
@@ -6,7 +6,7 @@ define puppet::defines::fact_d ($ensure = 'present', $key = false, $value) {
} }
file { "${puppet::common::facts_d}/${k_real}.txt": file { "${puppet::common::facts_d}/${k_real}.txt":
content => "${k_real}=${value}",
ensure => $ensure, ensure => $ensure,
content => "${k_real}=${value}",
} }
} }

2
manifests/puppetlabs_apt.pp
View File

@@ -1,8 +1,8 @@
class puppet::puppetlabs_apt ($ensure = 'present') { class puppet::puppetlabs_apt ($ensure = 'present') {
apt::source { 'puppetlabs': apt::source { 'puppetlabs':
ensure => $ensure,
key => '4BD6EC30', key => '4BD6EC30',
location => 'http://apt.puppetlabs.com', location => 'http://apt.puppetlabs.com',
repos => 'main', repos => 'main',
ensure => $ensure,
} }
} }

26
manifests/puppetmaster.pp
View File

@@ -1,4 +1,4 @@
class puppet::puppetmaster ($ensure = "present", $puppetqd = false) { class puppet::puppetmaster ($ensure = 'present', $puppetqd = false) {
require 'puppet::common' require 'puppet::common'
if !defined(Class['puppet::puppetlabs_apt']) { if !defined(Class['puppet::puppetlabs_apt']) {
@@ -7,37 +7,37 @@ class puppet::puppetmaster ($ensure = "present", $puppetqd = false) {
} }
if $puppetqd { if $puppetqd {
class { "activemq": ensure => $ensure } class { 'activemq': ensure => $ensure }
package { "libnet-arp-perl": ensure => $ensure } package { 'libnet-arp-perl': ensure => $ensure }
service { "stompserver": service { 'stompserver':
ensure => false, ensure => false,
enable => false, enable => false,
before => Class["activemq"], before => Class['activemq'],
} }
service { "puppetqd": service { 'puppetqd':
ensure => running, ensure => running,
pattern => "puppet queue queue", pattern => 'puppet queue queue',
enable => true, enable => true,
} }
} }
if defined(Class['ganglia']) { if defined(Class['ganglia']) {
Ganglia::Gmetric::Cron { Ganglia::Gmetric::Cron {
source => "puppet/ganglia", source => 'puppet/ganglia',
ensure => "${ensure}", ensure => $ensure,
} }
ganglia::gmetric::cron { "puppetmaster.rb": runwhen => "5", } ganglia::gmetric::cron { 'puppetmaster.rb': runwhen => '5', }
ganglia::gmetric::cron { "puppetmaster_compiletime.rb": runwhen => "60", } ganglia::gmetric::cron { 'puppetmaster_compiletime.rb': runwhen => '60', }
} }
# ## remove disk reports from time to time # ## remove disk reports from time to time
tidy { "${puppet_vardir}/reports": tidy { "${::puppet_vardir}/reports":
age => "1d", age => '1d',
recurse => true, recurse => true,
backup => false, backup => false,
} }