diff --git a/.travis.yml b/.travis.yml index ba588c7..6dcd006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: ruby 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 +15,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' diff --git a/manifests/init.pp b/manifests/init.pp index fbe03d3..a3a380b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -176,7 +176,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': }