Merge pull request #227 from kbarber/ticket/master/pdb-2637-provide-static-facts-to-fix-rspec-tests

(PDB-2637) Add static facts for selinux and iptables to fix rspec tests
This commit is contained in:
Ryan Senior 2016-04-20 09:15:28 -05:00
commit 98821c294d
4 changed files with 10 additions and 0 deletions

View file

@ -15,6 +15,8 @@ describe 'puppetdb', :type => :class do
:lsbdistcodename => 'foo', :lsbdistcodename => 'foo',
:id => 'root', :id => 'root',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:selinux => false,
:iptables_persistent_version => '0.5.7',
} }
end end
@ -31,6 +33,8 @@ describe 'puppetdb', :type => :class do
:operatingsystemrelease => '6.0', :operatingsystemrelease => '6.0',
:kernel => 'Linux', :kernel => 'Linux',
:concat_basedir => '/var/lib/puppet/concat', :concat_basedir => '/var/lib/puppet/concat',
:selinux => true,
:iptables_persistent_version => '0.5.7',
} }
end end
ttl_args.each do |ttl_arg| ttl_args.each do |ttl_arg|

View file

@ -14,6 +14,8 @@ describe 'puppetdb::master::config', :type => :class do
:concat_basedir => '/var/lib/puppet/concat', :concat_basedir => '/var/lib/puppet/concat',
:id => 'root', :id => 'root',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:selinux => true,
:iptables_persistent_version => '0.5.7',
} }
end end
@ -82,6 +84,7 @@ describe 'puppetdb::master::config', :type => :class do
:operatingsystemrelease => '7.0', :operatingsystemrelease => '7.0',
:kernel => 'Linux', :kernel => 'Linux',
:concat_basedir => '/var/lib/puppet/concat', :concat_basedir => '/var/lib/puppet/concat',
:selinux => true,
} }
end end
let (:pre_condition) { 'class { "puppetdb::globals": version => "3.1.1-1.el7", }' } let (:pre_condition) { 'class { "puppetdb::globals": version => "3.1.1-1.el7", }' }

View file

@ -14,6 +14,8 @@ describe 'puppetdb::master::puppetdb_conf', :type => :class do
:concat_basedir => '/var/lib/puppet/concat', :concat_basedir => '/var/lib/puppet/concat',
:id => 'root', :id => 'root',
:path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin', :path => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
:selinux => false,
:iptables_persistent_version => '0.5.7',
} }
end end

View file

@ -8,6 +8,7 @@ describe 'puppetdb::server', :type => :class do
:operatingsystemrelease => '6.5', :operatingsystemrelease => '6.5',
:fqdn => 'test.domain.local', :fqdn => 'test.domain.local',
:kernel => 'Linux', :kernel => 'Linux',
:selinux => true,
} }
context 'on a supported platform' do context 'on a supported platform' do