diff --git a/modules/exim/manifests/params.pp b/modules/exim/manifests/params.pp
index a1212a4339..516209d8ba 100644
--- a/modules/exim/manifests/params.pp
+++ b/modules/exim/manifests/params.pp
@@ -10,14 +10,14 @@ class exim::params {
$config_file = '/etc/exim/exim.conf'
$conf_dir = '/etc/exim/'
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
$package = 'exim4-daemon-light'
$service_name = 'exim4'
$config_file = '/etc/exim4/exim4.conf'
$conf_dir = '/etc/exim4'
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'exim' module only supports osfamily Ubuntu or Redhat(slaves only).")
+ fail("Unsupported osfamily: ${::osfamily} The 'exim' module only supports osfamily Debian or RedHat (slaves only).")
}
}
}
diff --git a/modules/iptables/manifests/params.pp b/modules/iptables/manifests/params.pp
index e11c7b2736..b825177e19 100644
--- a/modules/iptables/manifests/params.pp
+++ b/modules/iptables/manifests/params.pp
@@ -14,7 +14,7 @@ class iptables::params {
$service_status_cmd = undef
$service_has_restart = false
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
$package_name = 'iptables-persistent'
$service_name = 'iptables-persistent'
$rules_dir = '/etc/iptables'
@@ -32,7 +32,7 @@ class iptables::params {
$service_has_restart = false
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'iptables' module only supports osfamily Ubuntu or Redhat(slaves only).")
+ fail("Unsupported osfamily: ${::osfamily} The 'iptables' module only supports osfamily Debian or RedHat (slaves only).")
}
}
}
diff --git a/modules/jenkins/manifests/params.pp b/modules/jenkins/manifests/params.pp
index 47ce30a2b9..8a678610ac 100644
--- a/modules/jenkins/manifests/params.pp
+++ b/modules/jenkins/manifests/params.pp
@@ -47,7 +47,7 @@ class jenkins::params {
$cgconfig_require = Package['cgroups']
$cgred_require = Package['cgroups']
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
# common packages
$jdk_package = 'default-jdk'
$ccache_package = 'ccache'
@@ -94,7 +94,7 @@ class jenkins::params {
]
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Ubuntu or Redhat(slaves only).")
+ fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")
}
}
}
diff --git a/modules/jenkins/manifests/slave.pp b/modules/jenkins/manifests/slave.pp
index eeb78b57c1..7445eb78b9 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -66,29 +66,34 @@ class jenkins::slave(
ensure => present,
}
- if ($::osfamily == 'RedHat') {
+ case $::osfamily {
+ 'RedHat': {
+
+ exec { 'yum Group Install':
+ unless => '/usr/bin/yum grouplist "Development tools" | /bin/grep "^Installed Groups"',
+ command => '/usr/bin/yum -y groupinstall "Development tools"',
+ }
- exec { 'yum Group Install':
- unless => '/usr/bin/yum grouplist "Development tools" | /bin/grep "^Installed Groups"',
- command => '/usr/bin/yum -y groupinstall "Development tools"',
}
+ 'Debian': {
- }
- if ($::operatingsystem == 'Ubuntu') {
+ # install build-essential package group
+ package { 'build-essential':
+ ensure => present,
+ }
+
+ package { $::jenkins::params::maven_package:
+ ensure => present,
+ }
+
+ package { $::jenkins::params::python3_dev_package:
+ ensure => present,
+ }
- # install build-essential package group
- package { 'build-essential':
- ensure => present,
}
-
- package { $::jenkins::params::maven_package:
- ensure => present,
+ default: {
+ fail("Unsupported osfamily: ${::osfamily} The 'jenkins' module only supports osfamily Debian or RedHat (slaves only).")
}
-
- package { $::jenkins::params::python3_dev_package:
- ensure => present,
- }
-
}
if ($bare == false) {
diff --git a/modules/openstack_project/manifests/params.pp b/modules/openstack_project/manifests/params.pp
index 5ec7b6459e..6f3d0ef4f0 100644
--- a/modules/openstack_project/manifests/params.pp
+++ b/modules/openstack_project/manifests/params.pp
@@ -9,13 +9,13 @@ class openstack_project::params {
$user_packages = ['byobu', 'emacs-nox']
$update_pkg_list_cmd = ''
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
$packages = ['puppet', 'python-setuptools', 'wget']
$user_packages = ['byobu', 'emacs23-nox']
$update_pkg_list_cmd = 'apt-get update >/dev/null 2>&1;'
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'openstack_project' module only supports osfamily Ubuntu or Redhat(slaves only).")
+ fail("Unsupported osfamily: ${::osfamily} The 'openstack_project' module only supports osfamily Debian or RedHat (slaves only).")
}
}
}
diff --git a/modules/pip/manifests/params.pp b/modules/pip/manifests/params.pp
index c580feba41..f3b7ae41de 100644
--- a/modules/pip/manifests/params.pp
+++ b/modules/pip/manifests/params.pp
@@ -8,12 +8,12 @@ class pip::params {
$python_devel_package = 'python-devel'
$python_pip_package = 'python-pip'
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
$python_devel_package = 'python-all-dev'
$python_pip_package = 'python-pip'
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'pip' module only supports osfamily Fedora, Redhat, Debian, or Ubuntu.")
+ fail("Unsupported osfamily: ${::osfamily} The 'pip' module only supports osfamily Debian or RedHat.")
}
}
}
diff --git a/modules/snmpd/manifests/params.pp b/modules/snmpd/manifests/params.pp
index fe2452f918..1489671e4b 100644
--- a/modules/snmpd/manifests/params.pp
+++ b/modules/snmpd/manifests/params.pp
@@ -7,11 +7,11 @@ class snmpd::params {
'RedHat': {
$package_name = 'net-snmp'
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
$package_name = 'snmpd'
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'snmpd' module only supports osfamily Ubuntu or Redhat(slaves only).")
+ fail("Unsupported osfamily: ${::osfamily} The 'snmpd' module only supports osfamily Debian or RedHat (slaves only).")
}
}
}
diff --git a/modules/ssh/manifests/params.pp b/modules/ssh/manifests/params.pp
index 52c13b29f2..ac5740be7d 100644
--- a/modules/ssh/manifests/params.pp
+++ b/modules/ssh/manifests/params.pp
@@ -8,12 +8,12 @@ class ssh::params {
$package_name = 'openssh-server'
$service_name = 'sshd'
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
$package_name = 'openssh-server'
$service_name = 'ssh'
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'ssh' module only supports osfamily Ubuntu or Redhat(slaves only).")
+ fail("Unsupported osfamily: ${::osfamily} The 'ssh' module only supports osfamily Debian or RedHat (slaves only).")
}
}
}
diff --git a/modules/ulimit/manifests/params.pp b/modules/ulimit/manifests/params.pp
index 0ee23a22d4..0796ea8a55 100644
--- a/modules/ulimit/manifests/params.pp
+++ b/modules/ulimit/manifests/params.pp
@@ -7,11 +7,11 @@ class ulimit::params {
'RedHat': {
$pam_packages = ['pam']
}
- 'Debian', 'Ubuntu': {
+ 'Debian': {
$pam_packages = ['libpam-modules', 'libpam-modules-bin']
}
default: {
- fail("Unsupported osfamily: ${::osfamily} The 'ulimit' module only supports osfamily Fedora, Redhat, Debian, or Ubuntu.")
+ fail("Unsupported osfamily: ${::osfamily} The 'ulimit' module only supports osfamily Debian or RedHat.")
}
}
}