From d4ab6d681a0e94e86de919cebdbe410d1a8b5562 Mon Sep 17 00:00:00 2001
From: Joshua Hoblitt <jhoblitt@cpan.org>
Date: Thu, 6 Jun 2013 17:06:38 -0700
Subject: [PATCH] fix setting megaraid device options via device_opts => {
 'megaraid' => ... }

---
 spec/classes/smartd_spec.rb | 32 ++++++++++++++++++++++++++++++++
 templates/smartd.conf       |  6 ++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/spec/classes/smartd_spec.rb b/spec/classes/smartd_spec.rb
index 5287719..c54692d 100644
--- a/spec/classes/smartd_spec.rb
+++ b/spec/classes/smartd_spec.rb
@@ -44,4 +44,36 @@
         END
     end
   end
+
+  context 'without params + megaraid facts' do
+    let(:facts) do
+      {
+        :osfamily=> 'RedHat', :lsbmajordistrelease => 6,
+        :megaraid_adapters        => '1',
+        :megaraid_virtual_drives  => '/dev/sdb,/dev/sda',
+        :megaraid_physical_drives => '2,1',
+      }
+    end
+
+    let(:params) do
+      {
+        :device_opts => { 'megaraid' => '-I 194'},
+      }
+    end
+
+    it do
+      should include_class('smartd')
+      should include_class('smartd::params')
+      should contain_package('smartmontools')
+      should contain_service('smartd')
+      should contain_file('/etc/smartd.conf')\
+        .with_content(<<-END.gsub(/^\s+/, ""))
+          # Managed by Puppet -- do not edit!
+          DEFAULT -m root -M daily
+          /dev/sda -d sat+megaraid,1 -I 194
+          /dev/sda -d sat+megaraid,2 -I 194
+          DEVICESCAN
+        END
+    end
+  end
 end
diff --git a/templates/smartd.conf b/templates/smartd.conf
index d05804a..d89269d 100644
--- a/templates/smartd.conf
+++ b/templates/smartd.conf
@@ -17,10 +17,8 @@ end
 if megaraid_device and megaraid_device != '' and
      @megaraid_adapters and @megaraid_adapters.to_i > 0
   @megaraid_physical_drives.split(/,/).sort.each do |drive| -%>
-<%= megaraid_device %> -d sat+megaraid,<%= drive.to_i %>
-<% if @device_opts.has_key?('megaraid') -%>
- <%= @device_opts['megaraid'] -%>
-<% end #newline here, please %>
+<%= megaraid_device %> -d sat+megaraid,<%= drive.to_i -%>
+<% if @device_opts.has_key?('megaraid') %> <%= @device_opts['megaraid'] %><% end %>
 <% end -%>
 <% end -%>
 <% if @devicescan -%>