From 2a329d545d0e619c88c323148d5fe2098e70b4b1 Mon Sep 17 00:00:00 2001
From: Oliver Walsh <owalsh@redhat.com>
Date: Tue, 11 Apr 2017 21:42:44 +0100
Subject: 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
---
 manifests/profile/base/sshd.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'manifests/profile/base/sshd.pp')

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', ]
-- 
cgit 1.2.3-korg