From 3026e27aba2cfd8777b211fac19d8df677f1d026 Mon Sep 17 00:00:00 2001 From: Oliver Walsh Date: Tue, 11 Apr 2017 21:42:44 +0100 Subject: [PATCH] Stop SSHD profile clobbering SSH client config Including the ::ssh manifest will manage both client and server config. Managing the client config was not intended and will clobber the OS default config with the puppet ssh moduled defaults. Follow up for https://review.openstack.org/443113 where I found the issue after the changes merged. Change-Id: I6329f5ebbe8fc3950449e325e56293872d11e1b5 Related-Bug: 1668543 (cherry picked from commit 2a329d545d0e619c88c323148d5fe2098e70b4b1) (cherry picked from commit f01cef046df57d5257560d3f83bef2e91c3c722e) --- manifests/profile/base/sshd.pp | 2 +- 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 f43089c38..2b860325c 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 c611fe992..e84a1f548 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')