From e164471e36cc6ae240748cd683e7b484a93ea136 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley 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 Reviewed-by: Clark Boylan Reviewed-by: James E. Blair Approved: Jeremy Stanley Reviewed-by: Jeremy Stanley 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 e11c7b2..b825177 100644 --- a/manifests/params.pp +++ b/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).") } } }