Merge "Use validate_legacy"
This commit is contained in:
commit
678c48a065
|
@ -240,7 +240,8 @@ class ceph::profile::params (
|
||||||
$fs_name = undef,
|
$fs_name = undef,
|
||||||
$rbd_default_features = undef,
|
$rbd_default_features = undef,
|
||||||
) {
|
) {
|
||||||
validate_hash($client_keys)
|
|
||||||
|
validate_legacy(Hash, 'validate_hash', $client_keys)
|
||||||
|
|
||||||
if $authentication_type == 'cephx' and empty($client_keys) {
|
if $authentication_type == 'cephx' and empty($client_keys) {
|
||||||
fail("client_keys must be provided when using authentication_type = 'cephx'")
|
fail("client_keys must be provided when using authentication_type = 'cephx'")
|
||||||
|
|
|
@ -28,7 +28,7 @@ describe 'ceph::profile::params' do
|
||||||
}"
|
}"
|
||||||
end
|
end
|
||||||
|
|
||||||
it { should raise_error Puppet::Error, /is not a Hash/ }
|
it { should raise_error(Puppet::Error) }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "should fail when using cephx without client_keys" do
|
describe "should fail when using cephx without client_keys" do
|
||||||
|
|
Loading…
Reference in New Issue