Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

...
  • 5 commits
  • 2 files changed
  • 0 commit comments
  • 2 contributors
Showing with 27 additions and 16 deletions.
  1. +4 −2 lib/facter/warranty.rb
  2. +23 −14 manifests/params.pp
6 lib/facter/warranty.rb
View
@@ -15,8 +15,10 @@
output = file.read
file.close
else
- output = IO.popen("#{check_script} -s #{tag}").read
- if output
+ cmd = IO.popen("#{check_script} -s #{tag}")
+ output = cmd.read
+ cmd.close
+ if $?.exitstatus.to_i == 0
file = File.new(cache, "w")
file.puts output
file.close
37 manifests/params.pp
View
@@ -6,34 +6,43 @@
#
class dell::params {
- $omsa_url_base = $dell_omsa_url_base ? {
+ $omsa_url_base = $::dell_omsa_url_base ? {
'' => 'http://linux.dell.com/repo/hardware/',
- default => $dell_omsa_url_base,
+ default => $::dell_omsa_url_base,
}
- $omsa_url_args_indep = $dell_omsa_url_args_indep ? {
+ $omsa_url_args_indep = $::dell_omsa_url_args_indep ? {
'' => 'osname=el$releasever&basearch=$basearch&native=1&dellsysidpluginver=$dellsysidpluginver',
- default => $dell_omsa_url_args_indep,
+ default => $::dell_omsa_url_args_indep,
}
- $omsa_url_args_specific = $dell_omsa_url_args_specific ? {
+ $omsa_url_args_specific = $::dell_omsa_url_args_specific ? {
'' => 'osname=el$releasever&basearch=$basearch&native=1&sys_ven_id=$sys_ven_id&sys_dev_id=$sys_dev_id&dellsysidpluginver=$dellsysidpluginver',
- default => $dell_omsa_url_args_specific,
+ default => $::dell_omsa_url_args_specific,
}
- $omsa_version = $dell_omsa_version ? {
- '' => 'latest',
- default => "OMSA_$dell_omsa_version",
+ $omsa_version = $::dell_omsa_version ? {
+ '' => $::productname ? {
+ 'PowerEdge 1750' => 'OMSA_6.1',
+ 'PowerEdge 1850' => 'OMSA_5.5',
+ 'PowerEdge 1950' => 'OMSA_6.1',
+ 'PowerEdge 2950' => 'OMSA_5.4',
+ 'PowerEdge R610' => 'OMSA_6.4',
+ 'PowerEdge R620' => 'OMSA_7.2',
+ default => 'OMSA_5.4',
+ },
+ 'latest' => 'latest',
+ default => "OMSA_${::dell_omsa_version}",
}
- $customplugins = $dell_customplugins ? {
- '' => '/usr/local/src',
- default => $dell_customplugins,
+ $customplugins = $::dell_customplugins ? {
+ '' => '/usr/local/src',
+ default => $::dell_customplugins,
}
- $check_warranty_revision = $dell_check_warranty_revision ? {
+ $check_warranty_revision = $::dell_check_warranty_revision ? {
'' => '42d157c57b1247e651021098b278adf14e468805',
- default => $dell_check_warranty_revision,
+ default => $::dell_check_warranty_revision,
}
}

No commit comments for this range

Something went wrong with that request. Please try again.