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

finale version

Browse Source
This commit is contained in:
Udo Waechter
2016-07-14 11:08:54 +02:00
parent 359a89d882
commit ac6e8d0b99
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/agent.pp
View File

@@ -14,14 +14,11 @@ class puppet::agent (
case $::kernel { case $::kernel {
'Linux' : { 'Linux' : {
$puppetpkgs = ['puppet', 'puppet-common'] $puppetpkgs = ['puppet-agent']
Package { Package {
provider => 'apt' } provider => 'apt' }
if $::lsbdistid != 'Ubuntu' {
package { 'ruby-msgpack': ensure => $ensure }
}
} }
default : { default : {
$puppetpkgs = 'puppet' $puppetpkgs = 'puppet'
@@ -91,7 +88,7 @@ class puppet::agent (
# #settings # #settings
if $ensure != 'absent' { if $ensure != 'absent' {
Ini_setting { Ini_setting {
path => '/etc/puppet/puppet.conf', path => '/etc/puppetlabs/puppet/puppet.conf',
section => 'agent', section => 'agent',
} }

7
manifests/puppetlabs_apt.pp
View File

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