facter 1.7 has its own fact.d
This commit is contained in:
@@ -5,17 +5,25 @@ class puppet::common ($ensure = 'present') {
|
|||||||
default => $ensure,
|
default => $ensure,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$ens_dir = $ensure ? {
|
||||||
|
'present' => 'directory',
|
||||||
|
default => $ensure,
|
||||||
|
}
|
||||||
|
|
||||||
$facts_d = '/etc/facter/facts.d'
|
$facts_d = '/etc/facter/facts.d'
|
||||||
File['/etc/facter'] -> File[$facts_d]
|
File['/etc/facter'] -> File[$facts_d]
|
||||||
|
|
||||||
file { ['/etc/facter', $facts_d]:
|
file {
|
||||||
ensure => $ensure ? {
|
[
|
||||||
'present' => 'directory',
|
'/etc/facter',
|
||||||
default => $ensure,
|
$facts_d]:
|
||||||
},
|
ensure => $ens_dir,
|
||||||
mode => 0755,
|
mode => 0755,
|
||||||
owner => root,
|
owner => root,
|
||||||
group => root,
|
group => root;
|
||||||
|
|
||||||
|
"${::puppet_vardir}/exported":
|
||||||
|
ensure => $ens_dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
# add facter variable to custom facts.
|
# add facter variable to custom facts.
|
||||||
|
|||||||
@@ -74,7 +74,9 @@ class puppet (
|
|||||||
content => template("puppet/puppetd_run.sh.erb"),
|
content => template("puppet/puppetd_run.sh.erb"),
|
||||||
mode => 0700,
|
mode => 0700,
|
||||||
alias => "puppetd_run.sh",
|
alias => "puppetd_run.sh",
|
||||||
ensure => "${ensure}",
|
ensure => $ensure;
|
||||||
|
"/var/log/puppet":
|
||||||
|
mode => '0755',
|
||||||
}
|
}
|
||||||
|
|
||||||
case $::kernel {
|
case $::kernel {
|
||||||
|
|||||||
Reference in New Issue
Block a user