Merge "Stop SSHD profile clobbering SSH client config" into stable/newton
This commit is contained in:
commit
798ac59f63
|
@ -32,7 +32,7 @@ class tripleo::profile::base::sshd (
|
||||||
$motd = hiera('MOTD', undef),
|
$motd = hiera('MOTD', undef),
|
||||||
) {
|
) {
|
||||||
|
|
||||||
include ::ssh
|
include ::ssh::server
|
||||||
|
|
||||||
if $bannertext {
|
if $bannertext {
|
||||||
$filelist = [ '/etc/issue', '/etc/issue.net', ]
|
$filelist = [ '/etc/issue', '/etc/issue.net', ]
|
||||||
|
|
|
@ -24,7 +24,7 @@ describe 'tripleo::profile::base::sshd' do
|
||||||
|
|
||||||
context 'it should do nothing' do
|
context 'it should do nothing' do
|
||||||
it 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')
|
||||||
is_expected.to_not contain_file('/etc/issue.net')
|
is_expected.to_not contain_file('/etc/issue.net')
|
||||||
is_expected.to_not contain_file('/etc/motd')
|
is_expected.to_not contain_file('/etc/motd')
|
||||||
|
|
Loading…
Reference in New Issue