1 files changed, 49 insertions, 25 deletions

diff --git a/manifests/profile/base/sshd.pp b/manifests/profile/base/sshd.pp
index e7916c1..3f0245d 100644
--- a/manifests/profile/base/sshd.pp
+++ b/manifests/profile/base/sshd.pp
@@ -15,47 +15,71 @@
 #
 # == Class: tripleo::profile::base::sshd
 #
-# SSH profile for tripleo
+# SSH composable service for TripleO
 #
 # === Parameters
 #
 # [*bannertext*]
-#   The text used within SSH Banner
+#   The text used within /etc/issue and /etc/issue.net
 #   Defaults to hiera('BannerText')
 #
+# [*motd*]
+#   The text used within SSH Banner
+#   Defaults to hiera('MOTD')
+#
+# [*options*]
+#   Hash of SSHD options to set. See the puppet-ssh module documentation for
+#   details.
+#   Defaults to {}
+
 class tripleo::profile::base::sshd (
   $bannertext = hiera('BannerText', undef),
+  $motd = hiera('MOTD', undef),
+  $options = {}
 ) {
 
-  if $bannertext {
-    $action = 'set'
+  if $bannertext and $bannertext != '' {
+    $sshd_options_banner = {'Banner' => '/etc/issue.net'}
+    $filelist = [ '/etc/issue', '/etc/issue.net', ]
+    file { $filelist:
+      ensure  => file,
+      backup  => false,
+      content => $bannertext,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644'
+    }
   } else {
-    $action = 'rm'
+    $sshd_options_banner = {}
   }
 
-  package {'openssh-server':
-    ensure => installed,
+  if $motd and $motd != '' {
+    $sshd_options_motd = {'PrintMotd' => 'yes'}
+    file { '/etc/motd':
+      ensure  => file,
+      backup  => false,
+      content => $motd,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644'
+    }
+  } else {
+    $sshd_options_motd = {}
   }
 
-  augeas { 'sshd_config_banner':
-    context => '/files/etc/ssh/sshd_config',
-    changes => [ "${action} Banner /etc/issue"  ],
-    notify  => Service['sshd']
-  }
+  $sshd_options = merge(
+    $options,
+    $sshd_options_banner,
+    $sshd_options_motd
+  )
 
-  file { '/etc/issue':
-    ensure  => file,
-    backup  => false,
-    content => $bannertext,
-    owner   => 'root',
-    group   => 'root',
-    mode    => '0600'
+  # NB (owalsh) in puppet-ssh hiera takes precedence over the class param
+  # we need to control this, so error if it's set in hiera
+  if hiera('ssh:server::options', undef) {
+    err('ssh:server::options must not be set, use tripleo::profile::base::sshd::options')
   }
-
-  service { 'sshd':
-    ensure    => 'running',
-    enable    => true,
-    hasstatus => false,
-    require   => Package['openssh-server'],
+  class { '::ssh::server':
+    storeconfigs_enabled => false,
+    options              => $sshd_options
   }
 }