Refactor SSHD config to allow both SSHD options and banner/motd to be set
authorOliver Walsh <owalsh@redhat.com>
Tue, 18 Apr 2017 11:51:36 +0000 (12:51 +0100)
committerOliver Walsh <owalsh@redhat.com>
Fri, 21 Apr 2017 13:08:00 +0000 (14:08 +0100)
commit7d13719ab09a148aec7fac2930a0209c04611d8d
treec2fa57cc6ba9f428b59cd0834a676b693eb85dfe
parentf01cef046df57d5257560d3f83bef2e91c3c722e
Refactor SSHD config to allow both SSHD options and banner/motd to be set

In https://review.openstack.org/#/c/444622/7 the sshd_options and banner/motd
are mutually exclusive. This patch, and the next patchset of that review,
resolves the conflict.

Related-Bug: 1668543

Change-Id: I1d09530d69e42c0c36311789166554a889e46556
(cherry picked from commit 3c49f51c8f42472d0d1cb2986b46a6c96821293a)
manifests/profile/base/sshd.pp
spec/classes/tripleo_profile_base_sshd_spec.rb