projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use ruby1.9.1 to avoid ruby1.8 + puppetd segfaults on ball
[mirror/dsa-puppet.git]
/
modules
/
site
/
manifests
/
init.pp
diff --git
a/modules/site/manifests/init.pp
b/modules/site/manifests/init.pp
index
b9ebccc
..
d405714
100644
(file)
--- a/
modules/site/manifests/init.pp
+++ b/
modules/site/manifests/init.pp
@@
-3,11
+3,11
@@
class site {
$localinfo = yamlinfo('*', '/etc/puppet/modules/debian-org/misc/local.yaml')
$nodeinfo = nodeinfo($::fqdn, '/etc/puppet/modules/debian-org/misc/local.yaml')
$allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
$localinfo = yamlinfo('*', '/etc/puppet/modules/debian-org/misc/local.yaml')
$nodeinfo = nodeinfo($::fqdn, '/etc/puppet/modules/debian-org/misc/local.yaml')
$allnodeinfo = allnodeinfo('sshRSAHostKey ipHostNumber', 'purpose mXRecord physicalHost purpose')
- notice( sprintf('hoster for %s is %s', $::fqdn, getfromhash($nodeinfo, 'hoster', 'name') ) )
- notice( sprintf('facter hoster for %s is %s', $::fqdn, $::hoster) )
+ $roles = hiera('roles')
service { 'procps':
hasstatus => false,
status => '/bin/true',
}
service { 'procps':
hasstatus => false,
status => '/bin/true',
}
+
}
}