Merge pull request voxpupuli#44 from jhoblitt/bugfix/fedora-support

fix EL variant != 'RedHat' regression

Author: jfryman

manifests/params.pp

@@ -13,7 +13,11 @@
   case $::osfamily {
     'RedHat': {
       case $::operatingsystem {
-        'RedHat': {
+        'Fedora': {
+          $sx_fs_mount = '/sys/fs/selinux'
+          $package_name = 'policycoreutils-python'
+        }
+        default: {
           case $::operatingsystemmajrelease {
             '7': {
               $sx_fs_mount = '/sys/fs/selinux'
@@ -32,13 +36,6 @@
             }
           }
         }
-        'Fedora': {
-          $sx_fs_mount = '/sys/fs/selinux'
-          $package_name = 'policycoreutils-python'
-        }
-        default: {
-          fail("${::operatingsystem} is not supported")
-        }
       }
     }
     default: {

spec/classes/selinux_spec.rb

@@ -1,17 +1,16 @@
 require 'spec_helper'
 
 describe 'selinux' do
-  context 'Redhat 7' do
-    include_context 'RedHat 7'
+  [
+    'RedHat 7',
+    'CentOS 7',
+    'Fedora 22',
+  ].each do |ctx|
+    context ctx do
+      include_context ctx
 
-    it { should contain_class('selinux::package') }
-    it { should contain_class('selinux::config') }
-  end
-
-  context 'Fedora 22' do
-    include_context 'Fedora 22'
-
-    it { should contain_class('selinux::package') }
-    it { should contain_class('selinux::config') }
+      it { should contain_class('selinux::package') }
+      it { should contain_class('selinux::config') }
+    end
   end
 end

spec/spec_helper.rb

@@ -1,34 +1,36 @@
 require 'rubygems' if RUBY_VERSION < '1.9.0'
 require 'puppetlabs_spec_helper/module_spec_helper'
 
+facts = {
+  :osfamily                  => 'RedHat',
+  :operatingsystem           => 'RedHat',
+  :operatingsystemmajrelease => '7',
+  :selinux_current_mode      => 'enforcing',
+  # concat facts
+  :concat_basedir => '/tmp',
+  :id             => 0,
+  :is_pe          => false,
+  :path           => '/tmp',
+}
+
 shared_context 'RedHat 7' do
+  let(:facts) { facts }
+end
+
+shared_context 'CentOS 7' do
   let(:facts) do
-    {
-      :osfamily                  => 'RedHat',
-      :operatingsystem           => 'RedHat',
-      :operatingsystemmajrelease => '7',
-      :selinux_current_mode      => 'enforcing',
-      # concat facts
-      :concat_basedir => '/tmp',
-      :id             => 0,
-      :is_pe          => false,
-      :path           => '/tmp',
-    }
+    facts.dup.merge(
+      :operatingsystem           => 'CentOS',
+      :operatingsystemmajrelease => '7'
+    )
   end
 end
 
 shared_context 'Fedora 22' do
   let(:facts) do
-    {
-      :osfamily                  => 'RedHat',
+    facts.dup.merge(
       :operatingsystem           => 'Fedora',
-      :operatingsystemmajrelease => '22',
-      :selinux_current_mode      => 'enforcing',
-      # concat facts
-      :concat_basedir => '/tmp',
-      :id             => 0,
-      :is_pe          => false,
-      :path           => '/tmp',
-    }
+      :operatingsystemmajrelease => '22'
+    )
   end
 end