aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Walsh <owalsh@redhat.com>2017-04-11 21:42:44 +0100
committerOliver Walsh <owalsh@redhat.com>2017-04-11 21:54:44 +0100
commit2a329d545d0e619c88c323148d5fe2098e70b4b1 (patch)
treeeb1efae61b6d96cf0b5e2967602448a7bdd9c9d7
parentb10fa039b3db88908f3e9501d60750de9ffea073 (diff)
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
-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 (
$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')