openstack
/
tripleo-image-elements
Code Issues Proposed changes

Use nagios-common instead of nagios-plugins-all on RHEL. 

nagios-plugins-basic was mapped to nagios-plugins-all on RHEL, however
nagios-plugins-all is actually not shipped with RHEL. The reason it
seems to be installed via the snmpd element is so that the nagios
plugins directory exists.  This can be accomplished on RHEL by
installing nagios-common instead.

Migrates all of the element over to pkg-map as well for the other
installed packages.

Change-Id: I8773a93dcd8b348b501d8303ddd211b3edf1e2b9
This commit is contained in:
James Slagle 2014-12-10 12:59:16 -05:00
parent db14a65e8d
commit 5c67d970a0
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
elements/snmpd/install.d/67-snmpd
View File

@ -1,7 +1,8 @@
#!/bin/bash
set -eux
install-packages snmpd snmp-mibs-downloader lm-sensors nagios-plugins-basic
install-packages -m snmpd nagios_plugins_package snmpd_package snmp-mibs-downloader_package lm-sensors_package
# install our snmp check script
DEST_DIR="/usr/lib64/nagios/plugins"
if [ ! 'amd64' = "$ARCH" ] || [ ! -d $DEST_DIR ]; then

15
elements/snmpd/pkg-map Normal file
View File

@ -0,0 +1,15 @@
{
"family": {
"redhat": {
"nagios_plugins_package": "nagios-common",
"snmpd_package": "net-snmp",
"lm-sensors_package": "lm_sensors"
}
},
"default": {
"nagios_plugins_package": "nagios-plugins-basic",
"snmpd_package": "snmpd",
"snmp-mibs-downloader_package": "snmp-mibs-downloader",
"lm-sensors_package": "lm-sensors"
}
}