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:
parent
9eb93da056
commit
471eb1bbf2
@ -265,6 +265,10 @@ bundle install --path vendor/bundle
|
||||
bundle exec rake spec
|
||||
bundle exec rake lint
|
||||
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
|
||||
|
@ -20,15 +20,8 @@ class fluentd::params {
|
||||
|
||||
case $::osfamily {
|
||||
'Debian': {
|
||||
case $::operatingsystem {
|
||||
'Ubuntu': {
|
||||
$repo_manage = true
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${::operatingsystem}")
|
||||
}
|
||||
}
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${::osfamily}")
|
||||
}
|
||||
|
@ -5,6 +5,7 @@ class fluentd::repo::apt (
|
||||
$location = downcase("http://packages.treasuredata.com/2/${::operatingsystem}/${::lsbdistcodename}"),
|
||||
$release = $::lsbdistcodename,
|
||||
$repos = 'contrib',
|
||||
$architecture = $::architecture,
|
||||
$key = {
|
||||
'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
|
||||
'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
|
||||
@ -17,6 +18,7 @@ class fluentd::repo::apt (
|
||||
ensure => $ensure,
|
||||
location => $location,
|
||||
release => $release,
|
||||
architecture => $architecture,
|
||||
repos => $repos,
|
||||
key => $key,
|
||||
}
|
||||
|
@ -12,6 +12,10 @@
|
||||
{
|
||||
"operatingsystem": "Ubuntu",
|
||||
"operatingsystemrelease": [ "14.04", "12.04" ]
|
||||
},
|
||||
{
|
||||
"operatingsystem": "Debian",
|
||||
"operatingsystemrelease": [ "6", "7", "8"]
|
||||
}
|
||||
],
|
||||
"dependencies": [
|
||||
|
@ -14,7 +14,7 @@ RSpec.describe 'fluentd' do
|
||||
end
|
||||
|
||||
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 }
|
||||
end
|
||||
end
|
||||
|
10
spec/acceptance/nodesets/debian-60-x64.yml
Normal file
10
spec/acceptance/nodesets/debian-60-x64.yml
Normal 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
|
10
spec/acceptance/nodesets/debian-78-x64.yml
Normal file
10
spec/acceptance/nodesets/debian-78-x64.yml
Normal 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
|
10
spec/acceptance/nodesets/debian-82-x64.yml
Normal file
10
spec/acceptance/nodesets/debian-82-x64.yml
Normal 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
|
@ -6,5 +6,5 @@ HOSTS:
|
||||
box: puppetlabs/ubuntu-12.04-64-nocm
|
||||
hypervisor: vagrant
|
||||
CONFIG:
|
||||
log_level: verbose
|
||||
log_level: info
|
||||
type: foss
|
||||
|
10
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
Normal file
10
spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
Normal 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
|
@ -7,6 +7,7 @@ describe 'fluentd::repo::apt', :type => :class do
|
||||
:lsbdistid => 'Ubuntu',
|
||||
:operatingsystem => 'Ubuntu',
|
||||
:lsbdistcodename => 'precise',
|
||||
:architecture => 'amd64',
|
||||
}
|
||||
}
|
||||
|
||||
@ -18,6 +19,7 @@ describe 'fluentd::repo::apt', :type => :class do
|
||||
'location' => 'http://packages.treasuredata.com/2/ubuntu/precise',
|
||||
'release' => 'precise',
|
||||
'repos' => 'contrib',
|
||||
'architecture' => 'amd64',
|
||||
'key' => {
|
||||
'id' => 'C901622B5EC4AF820C38AB861093DB45A12E206F',
|
||||
'source' => 'http://packages.treasuredata.com/GPG-KEY-td-agent'
|
||||
|
Loading…
Reference in New Issue
Block a user