diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-25 16:22:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-25 16:22:43 +0000 |
| commit | ed01e0a1a88bb20f512b25d795803d899a556082 (patch) | |
| tree | 4057a2cbaf17b97dc7c36c79c2034f1114c520f2 | |
| parent | e7bf85f56c9ee2597d01b31d9fb9ba7c7634c238 (diff) | |
| parent | f01cef046df57d5257560d3f83bef2e91c3c722e (diff) | |
Merge "Stop SSHD profile clobbering SSH client config" into stable/ocata
| -rw-r--r-- | manifests/profile/base/sshd.pp | 2 | ||||
| -rw-r--r-- | spec/classes/tripleo_profile_base_sshd_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manifests/profile/base/sshd.pp b/manifests/profile/base/sshd.pp index f43089c..2b86032 100644 --- a/manifests/profile/base/sshd.pp +++ b/manifests/profile/base/sshd.pp @@ -32,7 +32,7 @@ class tripleo::profile::base::sshd ( $motd = hiera('MOTD', undef), ) { - include ::ssh + include ::ssh::server if $bannertext { $filelist = [ '/etc/issue', '/etc/issue.net', ] diff --git a/spec/classes/tripleo_profile_base_sshd_spec.rb b/spec/classes/tripleo_profile_base_sshd_spec.rb index c611fe9..e84a1f5 100644 --- a/spec/classes/tripleo_profile_base_sshd_spec.rb +++ b/spec/classes/tripleo_profile_base_sshd_spec.rb @@ -24,7 +24,7 @@ describe 'tripleo::profile::base::sshd' do context 'it should do nothing' do it do - is_expected.to contain_class('ssh') + is_expected.to contain_class('ssh::server') is_expected.to_not contain_file('/etc/issue') is_expected.to_not contain_file('/etc/issue.net') is_expected.to_not contain_file('/etc/motd') |