Merge pull request #90 from ghoneycutt/el7

El7
This commit is contained in:
Garrett Honeycutt 2014-10-15 08:45:57 -04:00
commit 72de64fd71
5 changed files with 112 additions and 104 deletions

View File

@ -4,6 +4,7 @@ env:
- PUPPET_VERSION=3.4.2
- PUPPET_VERSION=3.5.1
- PUPPET_VERSION=3.6.0
- PUPPET_VERSION=3.7.0
notifications:
email: false
rvm:

View File

@ -3,5 +3,5 @@ source 'https://rubygems.org'
puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 3.3']
gem 'puppet', puppetversion
gem 'puppetlabs_spec_helper', '>= 0.1.0'
gem 'puppet-lint', '>= 0.3.2'
gem 'puppet-lint', '>= 1.0.0'
gem 'facter', '>= 1.7.0'

View File

@ -13,6 +13,7 @@ This module has been tested to work on the following systems with Puppet v3 and
* Debian 7
* EL 5
* EL 6
* EL 7
* SLES 11
* Ubuntu 12.04 LTS
* Solaris 9

View File

@ -1,6 +1,7 @@
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-lint/tasks/puppet-lint'
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.relative = true
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
desc 'Run puppet in noop mode and check for syntax errors.'

View File

@ -2,10 +2,13 @@ require 'spec_helper'
describe 'ssh' do
context 'with default params on osfamily RedHat' do
['5','6','7'].each do |release|
context "release #{release}" do
let(:facts) do
{ :fqdn => 'monkey.example.com',
:lsbmajdistrelease => :release,
:osfamily => 'RedHat',
:sshrsakey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ=='
:sshrsakey => 'AAAAB3NzaC1yc2EAAAABIwAAAQEArGElx46pD6NNnlxVaTbp0ZJMgBKCmbTCT3RaeCk0ZUJtQ8wkcwTtqIXmmiuFsynUT0DFSd8UIodnBOPqitimmooAVAiAi30TtJVzADfPScMiUnBJKZajIBkEMkwUcqsfh630jyBvLPE/kyQcxbEeGtbu1DG3monkeymanOBW1AKc5o+cJLXcInLnbowMG7NXzujT3BRYn/9s5vtT1V9cuZJs4XLRXQ50NluxJI7sVfRPVvQI9EMbTS4AFBXUej3yfgaLSV+nPZC/lmJ2gR4t/tKvMFF9m16f8IcZKK7o0rK7v81G/tREbOT5YhcKLK+0wBfR6RsmHzwy4EddZloyLQ==',
}
end
@ -107,6 +110,8 @@ describe 'ssh' do
})
}
end
end
end
context 'with default params on osfamily Solaris kernelrelease 5.8' do
let :facts do