From 0196eac79b2e1a62d0cdcbeb11d7be2dac898a6f Mon Sep 17 00:00:00 2001 From: oloc Date: Fri, 10 Jul 2015 10:57:40 +0200 Subject: [PATCH 1/9] lsf_name : use a unique name in all situations --- manifests/config.pp | 2 +- manifests/init.pp | 7 ++++++- manifests/params.pp | 7 +++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index cc1fa3d..0644292 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -123,7 +123,7 @@ logstashforwarder_config { 'lsf-config': ensure => 'present', config => $main_config, - path => '/etc/logstash-forwarder.conf', + path => "${logstashforwarder::configdir}/${logstashforwarder::lsf_name}.conf", tag => "LSF_CONFIG_${::fqdn}", owner => $logstashforwarder::logstashforwarder_user, group => $logstashforwarder::logstashforwarder_group, diff --git a/manifests/init.pp b/manifests/init.pp index fbe03d3..c4c6247 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -20,6 +20,10 @@ # * This is thus destructive and should be used with care. # Defaults to present. # +# [*lsf_name*] +# String. Set the name used in any situations to avoid gap of naming. +# Defaults to logstash-forwarder. +# # [*autoupgrade*] # Boolean. If set to true, any managed package gets upgraded # on each Puppet run when the package provider is able to find a newer @@ -154,6 +158,7 @@ # class logstashforwarder( $ensure = $logstashforwarder::params::ensure, + $lsf_name = $logstashforwarder::params::lsf_name, $servers = undef, $ssl_cert = undef, $ssl_key = undef, @@ -176,7 +181,7 @@ $init_defaults = $logstashforwarder::params::init_defaults, $init_defaults_file = undef, $init_template = undef, - $manage_repo = false + $manage_repo = true, ) inherits logstashforwarder::params { anchor {'logstashforwarder::begin': } diff --git a/manifests/params.pp b/manifests/params.pp index 06cc955..d5c7e2a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,6 +34,9 @@ # ensure $ensure = 'present' + # Name to use instead of hardcoded name + $lsf_name = 'logstash-forwarder' + # autoupgrade $autoupgrade = false @@ -123,7 +126,7 @@ # service parameters case $::operatingsystem { 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': { - $service_name = 'logstash-forwarder' + $service_name = $lsf_name $service_hasrestart = true $service_hasstatus = true $service_pattern = $service_name @@ -131,7 +134,7 @@ $defaults_location = '/etc/sysconfig' } 'Debian', 'Ubuntu': { - $service_name = 'logstash-forwarder' + $service_name = $lsf_name $service_hasrestart = true $service_hasstatus = true $service_pattern = $service_name From 9593c069b221026cc6a72045002ce2edc2da7a54 Mon Sep 17 00:00:00 2001 From: oloc Date: Fri, 10 Jul 2015 15:38:43 +0200 Subject: [PATCH 2/9] Improvement: export the lsf_name everywhere if set in the class declaration. --- manifests/config.pp | 51 +++++++++++++++++++++++++++++++++++++++++++ manifests/params.pp | 53 +-------------------------------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 0644292..35bbb1a 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -41,6 +41,57 @@ cwd => '/', } + # Different path definitions + case $::kernel { + 'Linux': { + $configdir = "/etc/${logstashforwarder::lsf_name}" + $package_dir = "/opt/${logstashforwarder::lsf_name}/swdl" + $installpath = "/opt/${logstashforwarder::lsf_name}" + } + 'Darwin': { + $configdir = '/Library/Application Support/Logstashforwarder' + $package_dir = '/Library/Logstashforwarder/swdl' + $installpath = '/Library/Logstashforwarder' + } + default: { + fail("\"${module_name}\" provides no config directory default value + for \"${::kernel}\"") + } + } + + # service parameters + case $::operatingsystem { + 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': { + $service_name = $logstashforwarder::lsf_name + $service_hasrestart = true + $service_hasstatus = true + $service_pattern = $service_name + $service_providers = [ 'init' ] + $defaults_location = '/etc/sysconfig' + } + 'Debian', 'Ubuntu': { + $service_name = $logstashforwarder::lsf_name + $service_hasrestart = true + $service_hasstatus = true + $service_pattern = $service_name + $service_providers = [ 'init' ] + $defaults_location = '/etc/default' + } + 'Darwin': { + $service_name = 'net.logstash.forwarder' + $service_hasrestart = true + $service_hasstatus = true + $service_pattern = $service_name + $service_providers = [ 'launchd' ] + $defaults_location = false + } + default: { + fail("\"${module_name}\" provides no service parameters + for \"${::operatingsystem}\"") + } + } + + if ( $logstashforwarder::ensure == 'present' ) { $ssldir = "${logstashforwarder::configdir}/ssl" diff --git a/manifests/params.pp b/manifests/params.pp index d5c7e2a..b616561 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,7 +34,7 @@ # ensure $ensure = 'present' - # Name to use instead of hardcoded name + # Name to use instead of hardcoded name $lsf_name = 'logstash-forwarder' # autoupgrade @@ -89,24 +89,6 @@ } } - # Different path definitions - case $::kernel { - 'Linux': { - $configdir = '/etc/logstashforwarder' - $package_dir = '/opt/logstashforwarder/swdl' - $installpath = '/opt/logstashforwarder' - } - 'Darwin': { - $configdir = '/Library/Application Support/Logstashforwarder' - $package_dir = '/Library/Logstashforwarder/swdl' - $installpath = '/Library/Logstashforwarder' - } - default: { - fail("\"${module_name}\" provides no config directory default value - for \"${::kernel}\"") - } - } - # packages case $::operatingsystem { 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': { @@ -122,37 +104,4 @@ for \"${::operatingsystem}\"") } } - - # service parameters - case $::operatingsystem { - 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': { - $service_name = $lsf_name - $service_hasrestart = true - $service_hasstatus = true - $service_pattern = $service_name - $service_providers = [ 'init' ] - $defaults_location = '/etc/sysconfig' - } - 'Debian', 'Ubuntu': { - $service_name = $lsf_name - $service_hasrestart = true - $service_hasstatus = true - $service_pattern = $service_name - $service_providers = [ 'init' ] - $defaults_location = '/etc/default' - } - 'Darwin': { - $service_name = 'net.logstash.forwarder' - $service_hasrestart = true - $service_hasstatus = true - $service_pattern = $service_name - $service_providers = [ 'launchd' ] - $defaults_location = false - } - default: { - fail("\"${module_name}\" provides no service parameters - for \"${::operatingsystem}\"") - } - } - } From 1aa09dbafb63ab98ac7bc67970d0acac2ebe4f7b Mon Sep 17 00:00:00 2001 From: oloc Date: Thu, 16 Jul 2015 15:47:46 +0200 Subject: [PATCH 3/9] Update Gemfile to convert git into https to avoid RSA Key issue --- .travis.yml | 22 ++++++++++++++++++++-- Gemfile | 4 ++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ba588c7..03be2ba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 1.8.7 - 1.9.3 - 2.0.0 + - 2.1 before_install: rm Gemfile.lock || true script: - "bundle exec rake lint" @@ -15,6 +16,23 @@ env: - PUPPET_VERSION="~> 3.2.0" - PUPPET_VERSION="~> 3.3.0" - PUPPET_VERSION="~> 3.4.0" + - PUPPET_VERSION="~> 3.5.0" matrix: - allow_failures: - - rvm: 2.0.0 + exclude: + - rvm: 1.9.3 + env: PUPPET_VERSION="~> 2.7.0" + - rvm: 2.0.0 + env: PUPPET_VERSION="~> 2.7.0" + - rvm: 2.0.0 + env: PUPPET_VERSION="~> 3.1.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 2.7.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.1.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.2.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.3.0" + - rvm: 2.1 + env: PUPPET_VERSION="~> 3.4.0" + diff --git a/Gemfile b/Gemfile index b768425..e5da386 100644 --- a/Gemfile +++ b/Gemfile @@ -3,8 +3,8 @@ source 'https://rubygems.org' puppetversion = ENV['PUPPET_VERSION'] || '~> 3.7.0' gem 'puppet', puppetversion, :require => false -gem 'beaker', :git => 'git@github.com:puppetlabs/beaker.git', :branch => 'master' -gem 'beaker-rspec', :git => 'git@github.com:puppetlabs/beaker-rspec.git', :branch => 'master' +gem 'beaker', :git => 'https://github.com/puppetlabs/beaker.git', :branch => 'master' +gem 'beaker-rspec', :git => 'https://github.com/puppetlabs/beaker-rspec.git', :branch => 'master' gem 'metadata-json-lint', :git => 'https://github.com/nibalizer/metadata-json-lint.git', :branch => 'master' gem 'rspec-puppet', :git => 'https://github.com/rodjek/rspec-puppet.git', :branch => 'master' From 9d40004e1c54937005caa296c32646399c285d8e Mon Sep 17 00:00:00 2001 From: oloc Date: Thu, 16 Jul 2015 16:08:33 +0200 Subject: [PATCH 4/9] Update: remove the old Ruby 1.8.7 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 03be2ba..6dcd006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: ruby rvm: - - 1.8.7 - 1.9.3 - 2.0.0 - 2.1 From bb4d10e929a10a01f0c2acc110ebfd17bc048918 Mon Sep 17 00:00:00 2001 From: oloc Date: Mon, 20 Jul 2015 11:25:14 +0200 Subject: [PATCH 5/9] PR #46 - 2a482166dc2ae2357b74e4be44f1751dd3da156e --- manifests/repo.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/repo.pp b/manifests/repo.pp index d97462b..b75f4f2 100644 --- a/manifests/repo.pp +++ b/manifests/repo.pp @@ -39,7 +39,7 @@ location => 'http://packages.elasticsearch.org/logstashforwarder/debian', release => 'stable', repos => 'main', - key => 'D88E42B4', + key => '46095ACC8548582C1A2699A9D27D666CD88E42B4', key_source => 'http://packages.elasticsearch.org/GPG-KEY-elasticsearch', include_src => false, } From 590b99ee264ca2395dc18468cb82c4599b903a94 Mon Sep 17 00:00:00 2001 From: oloc Date: Mon, 20 Jul 2015 17:28:44 +0200 Subject: [PATCH 6/9] Revert "Improvement: export the lsf_name everywhere if set in the class declaration." This reverts commit 9593c069b221026cc6a72045002ce2edc2da7a54. --- manifests/config.pp | 51 ------------------------------------------- manifests/params.pp | 53 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/manifests/config.pp b/manifests/config.pp index 35bbb1a..0644292 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -41,57 +41,6 @@ cwd => '/', } - # Different path definitions - case $::kernel { - 'Linux': { - $configdir = "/etc/${logstashforwarder::lsf_name}" - $package_dir = "/opt/${logstashforwarder::lsf_name}/swdl" - $installpath = "/opt/${logstashforwarder::lsf_name}" - } - 'Darwin': { - $configdir = '/Library/Application Support/Logstashforwarder' - $package_dir = '/Library/Logstashforwarder/swdl' - $installpath = '/Library/Logstashforwarder' - } - default: { - fail("\"${module_name}\" provides no config directory default value - for \"${::kernel}\"") - } - } - - # service parameters - case $::operatingsystem { - 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': { - $service_name = $logstashforwarder::lsf_name - $service_hasrestart = true - $service_hasstatus = true - $service_pattern = $service_name - $service_providers = [ 'init' ] - $defaults_location = '/etc/sysconfig' - } - 'Debian', 'Ubuntu': { - $service_name = $logstashforwarder::lsf_name - $service_hasrestart = true - $service_hasstatus = true - $service_pattern = $service_name - $service_providers = [ 'init' ] - $defaults_location = '/etc/default' - } - 'Darwin': { - $service_name = 'net.logstash.forwarder' - $service_hasrestart = true - $service_hasstatus = true - $service_pattern = $service_name - $service_providers = [ 'launchd' ] - $defaults_location = false - } - default: { - fail("\"${module_name}\" provides no service parameters - for \"${::operatingsystem}\"") - } - } - - if ( $logstashforwarder::ensure == 'present' ) { $ssldir = "${logstashforwarder::configdir}/ssl" diff --git a/manifests/params.pp b/manifests/params.pp index b616561..d5c7e2a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -34,7 +34,7 @@ # ensure $ensure = 'present' - # Name to use instead of hardcoded name + # Name to use instead of hardcoded name $lsf_name = 'logstash-forwarder' # autoupgrade @@ -89,6 +89,24 @@ } } + # Different path definitions + case $::kernel { + 'Linux': { + $configdir = '/etc/logstashforwarder' + $package_dir = '/opt/logstashforwarder/swdl' + $installpath = '/opt/logstashforwarder' + } + 'Darwin': { + $configdir = '/Library/Application Support/Logstashforwarder' + $package_dir = '/Library/Logstashforwarder/swdl' + $installpath = '/Library/Logstashforwarder' + } + default: { + fail("\"${module_name}\" provides no config directory default value + for \"${::kernel}\"") + } + } + # packages case $::operatingsystem { 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': { @@ -104,4 +122,37 @@ for \"${::operatingsystem}\"") } } + + # service parameters + case $::operatingsystem { + 'RedHat', 'CentOS', 'Fedora', 'Scientific', 'Amazon', 'OracleLinux': { + $service_name = $lsf_name + $service_hasrestart = true + $service_hasstatus = true + $service_pattern = $service_name + $service_providers = [ 'init' ] + $defaults_location = '/etc/sysconfig' + } + 'Debian', 'Ubuntu': { + $service_name = $lsf_name + $service_hasrestart = true + $service_hasstatus = true + $service_pattern = $service_name + $service_providers = [ 'init' ] + $defaults_location = '/etc/default' + } + 'Darwin': { + $service_name = 'net.logstash.forwarder' + $service_hasrestart = true + $service_hasstatus = true + $service_pattern = $service_name + $service_providers = [ 'launchd' ] + $defaults_location = false + } + default: { + fail("\"${module_name}\" provides no service parameters + for \"${::operatingsystem}\"") + } + } + } From da147fe594f3908fd6737c1746a08ea7c9acb24f Mon Sep 17 00:00:00 2001 From: oloc Date: Tue, 21 Jul 2015 11:10:57 +0200 Subject: [PATCH 7/9] Revert the manage_repo to false. It is another project. --- manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index c4c6247..fb4a558 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -181,7 +181,7 @@ $init_defaults = $logstashforwarder::params::init_defaults, $init_defaults_file = undef, $init_template = undef, - $manage_repo = true, + $manage_repo = false ) inherits logstashforwarder::params { anchor {'logstashforwarder::begin': } From ceeaae380ff9be9c920f89b6b803ffb8daf431dc Mon Sep 17 00:00:00 2001 From: oloc Date: Tue, 21 Jul 2015 11:59:37 +0200 Subject: [PATCH 8/9] Modify the params dir. --- manifests/params.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index d5c7e2a..d297945 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -92,12 +92,12 @@ # Different path definitions case $::kernel { 'Linux': { - $configdir = '/etc/logstashforwarder' - $package_dir = '/opt/logstashforwarder/swdl' - $installpath = '/opt/logstashforwarder' + $configdir = "/etc/${lsf_name}" + $package_dir = "/opt/${lsf_name}/swdl" + $installpath = "/opt/${lsf_name}" } 'Darwin': { - $configdir = '/Library/Application Support/Logstashforwarder' + $configdir = '/Library/Application Support/Logstashforwarder' $package_dir = '/Library/Logstashforwarder/swdl' $installpath = '/Library/Logstashforwarder' } From 67c2c3f808f323aebc6a07340afe9f4604543310 Mon Sep 17 00:00:00 2001 From: oloc Date: Tue, 21 Jul 2015 12:13:13 +0200 Subject: [PATCH 9/9] Revision of the spec. --- .../001_logstashforwarder_init_spec.rb | 46 +++++++++---------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/spec/classes/001_logstashforwarder_init_spec.rb b/spec/classes/001_logstashforwarder_init_spec.rb index f70c165..f5b903d 100644 --- a/spec/classes/001_logstashforwarder_init_spec.rb +++ b/spec/classes/001_logstashforwarder_init_spec.rb @@ -46,8 +46,8 @@ it { should contain_class('logstashforwarder::config').that_requires('Class[logstashforwarder::package]') } it { should contain_class('logstashforwarder::service').that_requires('Class[logstashforwarder::package]').that_requires('Class[logstashforwarder::config]') } - it { should contain_file('/etc/logstashforwarder') } - it { should contain_file('/etc/logstashforwarder/ssl') } + it { should contain_file('/etc/logstash-forwarder') } + it { should contain_file('/etc/logstash-forwarder/ssl') } it { should contain_logstashforwarder_config('lsf-config') } end @@ -108,10 +108,10 @@ }) } - it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstashforwarder/swdl') } - it { should contain_file('/opt/logstashforwarder/swdl/').with(:purge => false, :force => false, :require => "Exec[create_package_dir_logstashforwarder]") } - it { should contain_file("/opt/logstashforwarder/swdl/package.#{pkg_ext}").with(:source => "puppet:///path/to/package.#{pkg_ext}", :backup => false) } - it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstashforwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } + it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstash-forwarder/swdl') } + it { should contain_file('/opt/logstash-forwarder/swdl/').with(:purge => false, :force => false, :require => "Exec[create_package_dir_logstashforwarder]") } + it { should contain_file("/opt/logstash-forwarder/swdl/package.#{pkg_ext}").with(:source => "puppet:///path/to/package.#{pkg_ext}", :backup => false) } + it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstash-forwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } end context 'using http:// schema' do @@ -122,10 +122,10 @@ }) } - it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstashforwarder/swdl') } - it { should contain_file('/opt/logstashforwarder/swdl/').with(:purge => false, :force => false, :require => "Exec[create_package_dir_logstashforwarder]") } - it { should contain_exec('download_package_logstashforwarder').with(:command => "wget -O /opt/logstashforwarder/swdl/package.#{pkg_ext} http://www.domain.com/path/to/package.#{pkg_ext} 2> /dev/null", :require => 'File[/opt/logstashforwarder/swdl]') } - it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstashforwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } + it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstash-forwarder/swdl') } + it { should contain_file('/opt/logstash-forwarder/swdl/').with(:purge => false, :force => false, :require => "Exec[create_package_dir_logstashforwarder]") } + it { should contain_exec('download_package_logstashforwarder').with(:command => "wget -O /opt/logstash-forwarder/swdl/package.#{pkg_ext} http://www.domain.com/path/to/package.#{pkg_ext} 2> /dev/null", :require => 'File[/opt/logstash-forwarder/swdl]') } + it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstash-forwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } end context 'using https:// schema' do @@ -136,10 +136,10 @@ }) } - it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstashforwarder/swdl') } - it { should contain_file('/opt/logstashforwarder/swdl').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_logstashforwarder]') } - it { should contain_exec('download_package_logstashforwarder').with(:command => "wget -O /opt/logstashforwarder/swdl/package.#{pkg_ext} https://www.domain.com/path/to/package.#{pkg_ext} 2> /dev/null", :require => 'File[/opt/logstashforwarder/swdl]') } - it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstashforwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } + it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstash-forwarder/swdl') } + it { should contain_file('/opt/logstash-forwarder/swdl').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_logstashforwarder]') } + it { should contain_exec('download_package_logstashforwarder').with(:command => "wget -O /opt/logstash-forwarder/swdl/package.#{pkg_ext} https://www.domain.com/path/to/package.#{pkg_ext} 2> /dev/null", :require => 'File[/opt/logstash-forwarder/swdl]') } + it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstash-forwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } end context 'using ftp:// schema' do @@ -150,10 +150,10 @@ }) } - it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstashforwarder/swdl') } - it { should contain_file('/opt/logstashforwarder/swdl').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_logstashforwarder]') } - it { should contain_exec('download_package_logstashforwarder').with(:command => "wget -O /opt/logstashforwarder/swdl/package.#{pkg_ext} ftp://www.domain.com/path/to/package.#{pkg_ext} 2> /dev/null", :require => 'File[/opt/logstashforwarder/swdl]') } - it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstashforwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } + it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstash-forwarder/swdl') } + it { should contain_file('/opt/logstash-forwarder/swdl').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_logstashforwarder]') } + it { should contain_exec('download_package_logstashforwarder').with(:command => "wget -O /opt/logstash-forwarder/swdl/package.#{pkg_ext} ftp://www.domain.com/path/to/package.#{pkg_ext} 2> /dev/null", :require => 'File[/opt/logstash-forwarder/swdl]') } + it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstash-forwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } end context 'using file:// schema' do @@ -164,10 +164,10 @@ }) } - it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstashforwarder/swdl') } - it { should contain_file('/opt/logstashforwarder/swdl').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_logstashforwarder]') } - it { should contain_file("/opt/logstashforwarder/swdl/package.#{pkg_ext}").with(:source => "/path/to/package.#{pkg_ext}", :backup => false) } - it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstashforwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } + it { should contain_exec('create_package_dir_logstashforwarder').with(:command => 'mkdir -p /opt/logstash-forwarder/swdl') } + it { should contain_file('/opt/logstash-forwarder/swdl').with(:purge => false, :force => false, :require => 'Exec[create_package_dir_logstashforwarder]') } + it { should contain_file("/opt/logstash-forwarder/swdl/package.#{pkg_ext}").with(:source => "/path/to/package.#{pkg_ext}", :backup => false) } + it { should contain_package('logstash-forwarder').with(:ensure => 'present', :source => "/opt/logstash-forwarder/swdl/package.#{pkg_ext}", :provider => pkg_prov) } end end @@ -282,7 +282,7 @@ }) } - it { should contain_file('/etc/logstashforwarder').with(:ensure => 'absent', :force => true, :recurse => true) } + it { should contain_file('/etc/logstash-forwarder').with(:ensure => 'absent', :force => true, :recurse => true) } it { should contain_package('logstash-forwarder').with(:ensure => 'purged') } it { should contain_service('logstash-forwarder').with(:ensure => 'stopped', :enable => false) }