opuppet/module-postgresql
5
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #368 from apenney/selinux-changes

Browse source 
This fixes this test to work in the face of oppressive SELinux!
This commit is contained in:
Ashley Penney 2014-02-20 16:46:36 -05:00
commit 0a8a9a5e1d
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
spec/acceptance/server/tablespace_spec.rb
View file

@ -10,7 +10,7 @@ describe 'postgresql::server::tablespace:' do
pp = <<-EOS.unindent
class { 'postgresql::server': }
file { '/tmp/pg_tablespaces':
file { '/tmp/postgres/pg_tablespaces':
ensure => 'directory',
owner => 'postgres',
group => 'postgres',
@ -18,7 +18,7 @@ describe 'postgresql::server::tablespace:' do
}
postgresql::server::tablespace { 'tablespace1':
location => '/tmp/pg_tablespaces/space1',
location => '/tmp/postgres/pg_tablespaces/space1',
}
postgresql::server::database { 'tablespacedb1':
encoding => 'utf8',
@ -34,7 +34,7 @@ describe 'postgresql::server::tablespace:' do
password_hash => postgresql_password('spcuser', 'spcuser'),
}
postgresql::server::tablespace { 'tablespace2':
location => '/tmp/pg_tablespaces/space2',
location => '/tmp/postgres/pg_tablespaces/space2',
owner => 'spcuser',
}
postgresql::server::database { 'tablespacedb3':
@ -43,6 +43,13 @@ describe 'postgresql::server::tablespace:' do
}
EOS
shell('mkdir -p /tmp/postgres')
# Apply appropriate selinux labels
if fact('osfamily') == 'RedHat'
if shell('getenforce').stdout == 'Enforcing'
shell('chcon -Rv --type=postgresql_db_t /tmp/postgres')
end
end
apply_manifest(pp, :catch_failures => true)
apply_manifest(pp, :catch_changes => true)