openstack
/
puppet-tripleo
Code Issues Proposed changes

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 2a329d545d)
(cherry picked from commit f01cef046d)
This commit is contained in:
Oliver Walsh 2017-04-11 21:42:44 +01:00
parent fc640d8c0e
commit 3026e27aba
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/profile/base/sshd.pp
View File

@ -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', ]

2
spec/classes/tripleo_profile_base_sshd_spec.rb
View File

@ -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')