From 3d8eb55ab320f83a77f31f3aa57a880f03e9a18b Mon Sep 17 00:00:00 2001 From: Jeremy Stanley <fungi@yuggoth.org> Date: Wed, 24 Apr 2013 02:42:55 +0000 Subject: [PATCH] The facter osfamily of Ubuntu is Debian. Clean up facter osfamily matches to just use Debian, not Ubuntu. This is manually tested and confirmed to at least be the case on Oneiric, Precise and Quantal. Change-Id: I27b184ac419910f9c3271c3b4e57886333282a5f Reviewed-on: https://review.openstack.org/27399 Reviewed-by: Spencer Krum <krum.spencer@gmail.com> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Tested-by: Jenkins --- manifests/params.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 0ee23a2..0796ea8 100644 --- a/manifests/params.pp +++ b/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.") } } }