From 0a1737eb181000e2d352863498e7a2b6342b2864 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 1 Mar 2013 11:54:55 -0500 Subject: [PATCH] Update ssh module to support RHEL. Parameterizes the ssh module so that it supports both Ubuntu and RHEL. Change-Id: I9163e2f41d9a25df5f757592e642073fc19001f5 Reviewed-on: https://review.openstack.org/23299 Reviewed-by: Jeremy Stanley Reviewed-by: James E. Blair Reviewed-by: Clark Boylan Reviewed-by: Monty Taylor Approved: James E. Blair Tested-by: Jenkins --- modules/ssh/manifests/init.pp | 5 +++-- modules/ssh/manifests/params.pp | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 modules/ssh/manifests/params.pp diff --git a/modules/ssh/manifests/init.pp b/modules/ssh/manifests/init.pp index 2c6a54d3ee..38b2b08c51 100644 --- a/modules/ssh/manifests/init.pp +++ b/modules/ssh/manifests/init.pp @@ -1,10 +1,11 @@ # == Class: ssh # class ssh { - package { 'openssh-server': + include ssh::params + package { $::ssh::params::package_name: ensure => present, } - service { 'ssh': + service { $::ssh::params::service_name: ensure => running, hasrestart => true, subscribe => File['/etc/ssh/sshd_config'], diff --git a/modules/ssh/manifests/params.pp b/modules/ssh/manifests/params.pp new file mode 100644 index 0000000000..355bb32995 --- /dev/null +++ b/modules/ssh/manifests/params.pp @@ -0,0 +1,19 @@ +# Class: ssh::params +# +# This class holds parameters that need to be +# accessed by other classes. +class ssh::params { + case $::osfamily { + 'Redhat': { + $package_name = 'openssh-server' + $service_name = 'sshd' + } + 'Debian', 'Ubuntu': { + $package_name = 'openssh-server' + $service_name = 'ssh' + } + default: { + fail("Unsupported osfamily: ${::osfamily} The 'ssh' module only supports osfamily Ubuntu or Redhat(slaves only).") + } + } +}