[Pkg-puppet-devel] [facter] 64/180: Revert "(FACT-451) Add Cumulus Linux distro to Debian OS family"

Stig Sandbeck Mathisen ssm at debian.org
Mon Jun 30 15:06:31 UTC 2014


This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit a57fd57f78f1d8aad012d5a5b8eea38cb1c4c4cb
Author: Peter Huene <peter.huene at puppetlabs.com>
Date:   Wed Apr 23 15:21:26 2014 -0700

    Revert "(FACT-451) Add Cumulus Linux distro to Debian OS family"
    
    This partially reverts commit 919034f4de449bd56f60de6e7f748046aede76c0;
    keeping the addition of the missing osfamily spec file.
    
    The CumulusLinux distro detection isn't present in stable; backing out
    the change to osfamily for CumulusLinux.
---
 lib/facter/osfamily.rb     | 2 +-
 spec/unit/osfamily_spec.rb | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/facter/osfamily.rb b/lib/facter/osfamily.rb
index f7008c1..6162ef8 100644
--- a/lib/facter/osfamily.rb
+++ b/lib/facter/osfamily.rb
@@ -18,7 +18,7 @@ Facter.add(:osfamily) do
     case Facter.value(:operatingsystem)
     when "RedHat", "Fedora", "CentOS", "Scientific", "SLC", "Ascendos", "CloudLinux", "PSBM", "OracleLinux", "OVS", "OEL", "Amazon", "XenServer"
       "RedHat"
-    when "Ubuntu", "Debian", "CumulusLinux"
+    when "Ubuntu", "Debian"
       "Debian"
     when "SLES", "SLED", "OpenSuSE", "SuSE"
       "Suse"
diff --git a/spec/unit/osfamily_spec.rb b/spec/unit/osfamily_spec.rb
index d0a1210..f1c16f2 100644
--- a/spec/unit/osfamily_spec.rb
+++ b/spec/unit/osfamily_spec.rb
@@ -13,7 +13,6 @@ describe "OS Family fact" do
     'Solaris'      => 'Solaris',
     'Ubuntu'       => 'Debian',
     'Debian'       => 'Debian',
-    'CumulusLinux' => 'Debian',
     'Gentoo'       => 'Gentoo',
     'Fedora'       => 'RedHat',
     'Amazon'       => 'RedHat',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git



More information about the Pkg-puppet-devel mailing list