Remove if for ssh_gssapiauthentication. Remove unnecessary line in spec_helper.rb. Fix dot by backslash.

This commit is contained in:
Kyle Fu 2015-05-07 11:19:40 +08:00
parent fbe72409ff
commit 29c042a960
3 changed files with 2 additions and 5 deletions

View File

@ -422,9 +422,7 @@ class ssh (
fail('ssh::sshd_config_banner must be set to be able to use sshd_banner_content.') fail('ssh::sshd_config_banner must be set to be able to use sshd_banner_content.')
} }
if $ssh_gssapiauthentication != undef { validate_re($ssh_gssapiauthentication, '^(yes|no)$', "ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <${ssh_gssapiauthentication}>.")
validate_re($ssh_gssapiauthentication, '^(yes|no)$', "ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <${ssh_gssapiauthentication}>.")
}
if $ssh_gssapidelegatecredentials != undef { if $ssh_gssapidelegatecredentials != undef {
validate_re($ssh_gssapidelegatecredentials, '^(yes|no)$', "ssh::ssh_gssapidelegatecredentials may be either 'yes' or 'no' and is set to <${ssh_gssapidelegatecredentials}>.") validate_re($ssh_gssapidelegatecredentials, '^(yes|no)$', "ssh::ssh_gssapidelegatecredentials may be either 'yes' or 'no' and is set to <${ssh_gssapidelegatecredentials}>.")

View File

@ -2288,7 +2288,7 @@ describe 'ssh' do
it do it do
expect { expect {
should contain_class('ssh') should contain_class('ssh')
}.to raise_error(Puppet::Error,/^ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <#{value.to_s}>./) }.to raise_error(Puppet::Error,/^ssh::ssh_gssapiauthentication may be either 'yes' or 'no' and is set to <#{value.to_s}>\./)
end end
end end
end end

View File

@ -1,2 +1 @@
require 'rubygems'
require 'puppetlabs_spec_helper/module_spec_helper' require 'puppetlabs_spec_helper/module_spec_helper'