1
0
mirror of https://github.com/krislamo/puppet-fluentd synced 2024-12-16 13:20:35 +00:00

added debian support

This commit is contained in:
Max Wilhelm 2016-01-23 00:32:29 +01:00
parent 9eb93da056
commit 471eb1bbf2
11 changed files with 70 additions and 25 deletions

View File

@ -265,6 +265,10 @@ bundle install --path vendor/bundle
bundle exec rake spec bundle exec rake spec
bundle exec rake lint bundle exec rake lint
bundle exec rake beaker BEAKER_set=ubuntu-server-1204-x64 bundle exec rake beaker BEAKER_set=ubuntu-server-1204-x64
bundle exec rake beaker BEAKER_set=ubuntu-server-1404-x64
bundle exec rake beaker BEAKER_set=debian-60-x64
bundle exec rake beaker BEAKER_set=debian-78-x64
bundle exec rake beaker BEAKER_set=debian-82-x64
``` ```
## License ## License

View File

@ -20,15 +20,8 @@ class fluentd::params {
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
case $::operatingsystem {
'Ubuntu': {
$repo_manage = true $repo_manage = true
} }
default: {
fail("Unsupported osfamily: ${::operatingsystem}")
}
}
}
default: { default: {
fail("Unsupported osfamily: ${::osfamily}") fail("Unsupported osfamily: ${::osfamily}")
} }

View File

@ -5,6 +5,7 @@ class fluentd::repo::apt (
$location = downcase("http://packages.treasuredata.com/2/${::operatingsystem}/${::lsbdistcodename}"), $location = downcase("http://packages.treasuredata.com/2/${::operatingsystem}/${::lsbdistcodename}"),
$release = $::lsbdistcodename, $release = $::lsbdistcodename,
$repos = 'contrib', $repos = 'contrib',
$architecture = $::architecture,
$key = { $key = {
'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F', 'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent' 'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
@ -17,6 +18,7 @@ class fluentd::repo::apt (
ensure => $ensure, ensure => $ensure,
location => $location, location => $location,
release => $release, release => $release,
architecture => $architecture,
repos => $repos, repos => $repos,
key => $key, key => $key,
} }

View File

@ -12,6 +12,10 @@
{ {
"operatingsystem": "Ubuntu", "operatingsystem": "Ubuntu",
"operatingsystemrelease": [ "14.04", "12.04" ] "operatingsystemrelease": [ "14.04", "12.04" ]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [ "6", "7", "8"]
} }
], ],
"dependencies": [ "dependencies": [

View File

@ -14,7 +14,7 @@ RSpec.describe 'fluentd' do
end end
describe service('td-agent') do describe service('td-agent') do
it { is_expected.to be_enabled.with_level(3) } it { is_expected.to be_enabled }
it { is_expected.to be_running } it { is_expected.to be_running }
end end
end end

View File

@ -0,0 +1,10 @@
HOSTS:
debian-60-x64:
roles:
- master
platform: debian-6-amd64
box: puppetlabs/debian-6.0.10-64-nocm
hypervisor: vagrant
CONFIG:
log_level: info
type: foss

View File

@ -0,0 +1,10 @@
HOSTS:
debian-78-x64:
roles:
- master
platform: debian-7-amd64
box: puppetlabs/debian-7.8-64-nocm
hypervisor: vagrant
CONFIG:
log_level: info
type: foss

View File

@ -0,0 +1,10 @@
HOSTS:
debian-82-x64:
roles:
- master
platform: debian-8-amd64
box: puppetlabs/debian-8.2-64-nocm
hypervisor: vagrant
CONFIG:
log_level: info
type: foss

View File

@ -6,5 +6,5 @@ HOSTS:
box: puppetlabs/ubuntu-12.04-64-nocm box: puppetlabs/ubuntu-12.04-64-nocm
hypervisor: vagrant hypervisor: vagrant
CONFIG: CONFIG:
log_level: verbose log_level: info
type: foss type: foss

View File

@ -0,0 +1,10 @@
HOSTS:
ubuntu-server-1404-x64:
roles:
- master
platform: ubuntu-14.04-amd64
box: puppetlabs/ubuntu-14.04-64-nocm
hypervisor: vagrant
CONFIG:
log_level: info
type: foss

View File

@ -7,6 +7,7 @@ describe 'fluentd::repo::apt', :type => :class do
:lsbdistid => 'Ubuntu', :lsbdistid => 'Ubuntu',
:operatingsystem => 'Ubuntu', :operatingsystem => 'Ubuntu',
:lsbdistcodename => 'precise', :lsbdistcodename => 'precise',
:architecture => 'amd64',
} }
} }
@ -18,6 +19,7 @@ describe 'fluentd::repo::apt', :type => :class do
'location' => 'http://packages.treasuredata.com/2/ubuntu/precise', 'location' => 'http://packages.treasuredata.com/2/ubuntu/precise',
'release' => 'precise', 'release' => 'precise',
'repos' => 'contrib', 'repos' => 'contrib',
'architecture' => 'amd64',
'key' => { 'key' => {
'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F', 'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent' 'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'