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

Merge pull request #552 from apenney/improve-graceful-failures

Browse source 
Handle graceful failure on RHEL4 and improve the messaging.
This commit is contained in:
Morgan Haskel 2014-08-08 12:27:26 -04:00
commit c70fc13fc1
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
manifests/params.pp
View file

@ -241,7 +241,7 @@ class mysql::params {
}
default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat, Debian, and FreeBSD, or operatingsystem Amazon")
fail("Unsupported platform: puppetlabs-${module_name} currently doesn't support ${::osfamily} or ${::operatingsystem}")
}
}
}
@ -303,4 +303,8 @@ class mysql::params {
},
}
## Additional graceful failures
if $::osfamily == 'RedHat' and $::operatingsystemmajrelease == '4' {
fail("Unsupported platform: puppetlabs-${module_name} only supports RedHat 5.0 and beyond")
}
}

3
spec/classes/graceful_failures_spec.rb
View file

@ -7,8 +7,7 @@ describe 'mysql::server' do
let(:facts) { facts }
context 'should gracefully fail' do
it { should_not contain_class('mysql::server') }
it { should raise_error(/Unsupported osfamily: foo/) }
it { expect { should compile}.to raise_error(Puppet::Error, /Unsupported platform:/) }
end
end
end

2
spec/classes/mysql_bindings_spec.rb
View file

@ -67,7 +67,7 @@ describe 'mysql::bindings' do
end
it 'should fail' do
expect { subject }.to raise_error(/Unsupported osfamily: foo/)
expect { subject }.to raise_error(/Unsupported platform:/)
end
end