diff --git a/README.md b/README.md index 7218e49..62b0ee4 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,10 @@ Notes * Only tested on CentOS 6.3 x86_64 on a HP DL140 G2. +Requirements +----- +* SNMP (https://github.com/razorsedge/puppet-snmp) + Issues ------ diff --git a/manifests/init.pp b/manifests/init.pp index cd43215..de94b83 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -16,6 +16,26 @@ # Ensure if present or absent. # Default: present # +# [*yum_server*] +# Servername where the repo is +# Default: 'http://downloads.linux.hp.com' +# +# [*yum_os*] +# OS-Name for the Repopath +# Default: Depending on the OS +# +# [*yum_path*] +# Path on the Server to the repos +# Default: '/SDR/downloads/proliantsupportpack' +# +# [*yum_priority*] +# +# Default: '50' +# +# [*yum_project*] +# +# Default: '0' +# # === Actions: # # Installs the SMH user and group as well as the YUM repository. @@ -37,9 +57,14 @@ # Copyright (C) 2012 Mike Arnold, unless otherwise noted. # class psp ( - $ensure = 'present', - $smh_gid = $psp::params::gid, - $smh_uid = $psp::params::uid + $ensure = 'present', + $smh_gid = $psp::params::gid, + $smh_uid = $psp::params::uid, + $yum_server = $psp::params::yum_server, + $yum_os = $psp::params::yum_os, + $yum_path = $psp::params::yum_path, + $yum_priority = $psp::params::yum_priority, + $yum_project = $psp::params::yum_project, ) inherits psp::params { case $ensure { @@ -73,10 +98,10 @@ descr => 'HP Software Delivery Repository for Proliant Support Pack', enabled => 1, gpgcheck => 1, - gpgkey => "${psp::params::yum_server}${psp::params::yum_path}/GPG-KEY-ProLiantSupportPack", - baseurl => "${psp::params::yum_server}${psp::params::yum_path}/${psp::params::yum_os}/\$releasever/packages/\$basearch/", - priority => $psp::params::yum_priority, - protect => $psp::params::yum_protect, + gpgkey => "${yum_server}${yum_path}/GPG-KEY-ProLiantSupportPack", + baseurl => "${yum_server}${yum_path}/${yum_os}/\$releasever/packages/\$basearch/", + priority => $yum_priority, + protect => $yum_protect, } } # If we are not on HP hardware, do not do anything. diff --git a/manifests/snmp.pp b/manifests/snmp.pp index 7a5e9b0..7a2729c 100644 --- a/manifests/snmp.pp +++ b/manifests/snmp.pp @@ -10,7 +10,7 @@ # # Copyright (C) 2012 Mike Arnold, unless otherwise noted. # -class psp::snmp inherits snmp::server { +class psp::snmp inherits snmp { # TODO: This is a total hack. Perhaps move this to Class['snmp::server::psp']? File['snmpd.conf'] { mode => '0660',