From a8a939a4d9cb10df6286cd7728e77d3e6aa9a66c Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Tue, 15 Dec 2015 16:11:11 -0500 Subject: [PATCH] Support Puppet v4.3.0 Requires upgrade to ghoneycutt/common v1.4.1 --- .fixtures.yml | 2 +- .travis.yml | 8 +++++++- metadata.json | 2 +- spec/classes/init_spec.rb | 2 +- spec/spec_helper.rb | 2 -- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index 282e5b4..dd0851a 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -5,7 +5,7 @@ fixtures: ref: '4.6.0' common: repo: 'https://github.com/ghoneycutt/puppet-module-common.git' - ref: 'v1.3.0' + ref: 'v1.4.1' firewall: repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git' ref: '0.2.1' diff --git a/.travis.yml b/.travis.yml index e2bc100..32a7ab4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,13 @@ env: - PUPPET_GEM_VERSION="~> 3.6.0" - PUPPET_GEM_VERSION="~> 3.7.0" - PUPPET_GEM_VERSION="~> 3.8.0" - - PUPPET_GEM_VERSION="~> 3" PARSER="future" + - PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes" - PUPPET_GEM_VERSION="~> 4.0.0" - PUPPET_GEM_VERSION="~> 4.1.0" - PUPPET_GEM_VERSION="~> 4.2.0" + - PUPPET_GEM_VERSION="~> 4.3.0" - PUPPET_GEM_VERSION="~> 4" + - PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes" sudo: false @@ -46,8 +48,12 @@ matrix: env: PUPPET_GEM_VERSION="~> 4.1.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4.2.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 4.3.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes" notifications: email: false diff --git a/metadata.json b/metadata.json index c2c55a1..c5d8d82 100644 --- a/metadata.json +++ b/metadata.json @@ -88,7 +88,7 @@ "description": "Manage SSH", "dependencies": [ {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}, - {"name":"ghoneycutt/common","version_requirement":">= 1.3.0 < 2.0.0"}, + {"name":"ghoneycutt/common","version_requirement":">= 1.4.1 < 2.0.0"}, {"name":"puppetlabs/firewall","version_requirement":">= 0.2.1 < 2.0.0"} ] } diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb index c3e9b9a..b523bd1 100644 --- a/spec/classes/init_spec.rb +++ b/spec/classes/init_spec.rb @@ -6,7 +6,7 @@ describe 'ssh' do context "release #{release}" do let(:facts) do { :fqdn => 'monkey.example.com', - :lsbmajdistrelease => :release, + :lsbmajdistrelease => release, :osfamily => 'RedHat', :sshrsakey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ==', } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 05afdb2..ee4c2b3 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,7 +9,5 @@ RSpec.configure do |config| # Facter.collection.loader.load(:ipaddress) Facter.clear Facter.clear_messages - - Puppet[:parser] = 'future' if ENV['FUTURE_PARSER'] == 'yes' end end