Add in support for EL 7 new config location.

EL 7 now puts the smartd.conf in /etc/smartmontools.
samuraiii · Sep 1, 2014 · 399ac1a · 399ac1a
1 parent a29b3e6
commit 399ac1a
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -34,7 +34,17 @@
       $config_file = '/usr/local/etc/smartd.conf'
       $service_name = 'smartd'
     }
-    'RedHat', 'SuSE': {
+    'RedHat': {
+      $config_file = $::operatingsystem ? {
+        'Fedora' => '/etc/smartd.conf',
+        default  => $::operatingsystemmajrelease ? {
+          '7'     => '/etc/smartmontools/smartd.conf',
+          default => '/etc/smartd.conf',
+        },
+      }
+      $service_name = 'smartd'
+    }
+    'SuSE': {
       $config_file = '/etc/smartd.conf'
       $service_name = 'smartd'
     }

diff --git a/spec/classes/smartd_spec.rb b/spec/classes/smartd_spec.rb
@@ -35,15 +35,46 @@
   end
 
   describe 'on a supported osfamily, default parameters' do
-    describe 'for osfamily RedHat' do
-      let(:facts) {{ :osfamily => 'RedHat', :smartmontools_version => '5.43' }}
+    describe 'for osfamily SuSE' do
+      let(:facts) {{ :osfamily => 'SuSE', :smartmontools_version => '5.43' }}
 
       it_behaves_like 'default', {}
       it { should_not contain_shell_config('start_smartd') }
       it { should contain_service('smartd').with_ensure('running').with_enable(true) }
       it { should contain_file('/etc/smartd.conf').with_notify('Service[smartd]') }
     end
 
+    describe 'for osfamily RedHat' do
+      describe 'for operatingsystem RedHat' do
+        describe 'for operatingsystemmajrelease 6' do
+          let(:facts) {{ :osfamily => 'RedHat', :operatingsystem => 'RedHat', :operatingsystemmajrelease => '6', :smartmontools_version => '5.43' }}
+
+          it_behaves_like 'default', {}
+          it { should_not contain_shell_config('start_smartd') }
+          it { should contain_service('smartd').with_ensure('running').with_enable(true) }
+          it { should contain_file('/etc/smartd.conf').with_notify('Service[smartd]') }
+        end
+
+        describe 'for operatingsystemmajrelease 7' do
+          let(:facts) {{ :osfamily => 'RedHat', :operatingsystem => 'RedHat', :operatingsystemmajrelease => '7', :smartmontools_version => '5.43' }}
+
+          it_behaves_like 'default', { :config_file => '/etc/smartmontools/smartd.conf' }
+          it { should_not contain_shell_config('start_smartd') }
+          it { should contain_service('smartd').with_ensure('running').with_enable(true) }
+          it { should contain_file('/etc/smartmontools/smartd.conf').with_notify('Service[smartd]') }
+        end
+      end
+
+      describe 'for operatingsystem Fedora' do
+        let(:facts) {{ :osfamily => 'RedHat', :operatingsystem => 'Fedora', :smartmontools_version => '5.43' }}
+
+        it_behaves_like 'default', {}
+        it { should_not contain_shell_config('start_smartd') }
+        it { should contain_service('smartd').with_ensure('running').with_enable(true) }
+        it { should contain_file('/etc/smartd.conf').with_notify('Service[smartd]') }
+      end
+    end
+
     describe 'for osfamily Debian' do
       let(:facts) {{ :osfamily => 'Debian', :smartmontools_version => '5.43' }}