summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-01 20:14:08 +0000
committerGerrit Code Review <review@openstack.org>2017-06-01 20:14:08 +0000
commit798ac59f63816d7c0171d194c37790a909051bee (patch)
tree101e6055cea2461750dfdde91a1d5f47713aaab2
parentd1a42bef4f65fb15b70bd75e506ab40616e2249a (diff)
parent3026e27aba2cfd8777b211fac19d8df677f1d026 (diff)
Merge "Stop SSHD profile clobbering SSH client config" into stable/newton
-rw-r--r--manifests/profile/base/sshd.pp2
-rw-r--r--spec/classes/tripleo_profile_base_sshd_spec.rb2
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 (
32 $motd = hiera('MOTD', undef), 32 $motd = hiera('MOTD', undef),
33) { 33) {
34 34
35 include ::ssh 35 include ::ssh::server
36 36
37 if $bannertext { 37 if $bannertext {
38 $filelist = [ '/etc/issue', '/etc/issue.net', ] 38 $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
24 24
25 context 'it should do nothing' do 25 context 'it should do nothing' do
26 it do 26 it do
27 is_expected.to contain_class('ssh') 27 is_expected.to contain_class('ssh::server')
28 is_expected.to_not contain_file('/etc/issue') 28 is_expected.to_not contain_file('/etc/issue')
29 is_expected.to_not contain_file('/etc/issue.net') 29 is_expected.to_not contain_file('/etc/issue.net')
30 is_expected.to_not contain_file('/etc/motd') 30 is_expected.to_not contain_file('/etc/motd')