Support Puppet v4.3.0

Requires upgrade to ghoneycutt/common v1.4.1
This commit is contained in:
Garrett Honeycutt 2015-12-15 16:11:11 -05:00
parent c487d6d8a8
commit a8a939a4d9
5 changed files with 10 additions and 6 deletions

View File

@ -5,7 +5,7 @@ fixtures:
ref: '4.6.0' ref: '4.6.0'
common: common:
repo: 'https://github.com/ghoneycutt/puppet-module-common.git' repo: 'https://github.com/ghoneycutt/puppet-module-common.git'
ref: 'v1.3.0' ref: 'v1.4.1'
firewall: firewall:
repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git' repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git'
ref: '0.2.1' ref: '0.2.1'

View File

@ -17,11 +17,13 @@ env:
- PUPPET_GEM_VERSION="~> 3.6.0" - PUPPET_GEM_VERSION="~> 3.6.0"
- PUPPET_GEM_VERSION="~> 3.7.0" - PUPPET_GEM_VERSION="~> 3.7.0"
- PUPPET_GEM_VERSION="~> 3.8.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.0.0"
- PUPPET_GEM_VERSION="~> 4.1.0" - PUPPET_GEM_VERSION="~> 4.1.0"
- PUPPET_GEM_VERSION="~> 4.2.0" - PUPPET_GEM_VERSION="~> 4.2.0"
- PUPPET_GEM_VERSION="~> 4.3.0"
- PUPPET_GEM_VERSION="~> 4" - PUPPET_GEM_VERSION="~> 4"
- PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
sudo: false sudo: false
@ -46,8 +48,12 @@ matrix:
env: PUPPET_GEM_VERSION="~> 4.1.0" env: PUPPET_GEM_VERSION="~> 4.1.0"
- rvm: 1.8.7 - rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.2.0" env: PUPPET_GEM_VERSION="~> 4.2.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4.3.0"
- rvm: 1.8.7 - rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4" env: PUPPET_GEM_VERSION="~> 4"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 4" STRICT_VARIABLES="yes"
notifications: notifications:
email: false email: false

View File

@ -88,7 +88,7 @@
"description": "Manage SSH", "description": "Manage SSH",
"dependencies": [ "dependencies": [
{"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}, {"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"} {"name":"puppetlabs/firewall","version_requirement":">= 0.2.1 < 2.0.0"}
] ]
} }

View File

@ -6,7 +6,7 @@ describe 'ssh' do
context "release #{release}" do context "release #{release}" do
let(:facts) do let(:facts) do
{ :fqdn => 'monkey.example.com', { :fqdn => 'monkey.example.com',
:lsbmajdistrelease => :release, :lsbmajdistrelease => release,
:osfamily => 'RedHat', :osfamily => 'RedHat',
:sshrsakey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ==', :sshrsakey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ==',
} }

View File

@ -9,7 +9,5 @@ RSpec.configure do |config|
# Facter.collection.loader.load(:ipaddress) # Facter.collection.loader.load(:ipaddress)
Facter.clear Facter.clear
Facter.clear_messages Facter.clear_messages
Puppet[:parser] = 'future' if ENV['FUTURE_PARSER'] == 'yes'
end end
end end