[openstack-tripleo-image-elements] Use nagios-common instead of nagios-plugins-all on RHEL.

[slagle]

commit 4cb3001cce91fa1603d4146a6626154c17f1e68a
Author: James Slagle <jslagle at redhat.com>
Date:   Mon Jan 5 14:46:20 2015 -0500

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

 ...common-instead-of-nagios-plugins-all-on-R.patch |   48 ++++++++++++++++++++
 openstack-tripleo-image-elements.spec              |    7 +++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/0019-Use-nagios-common-instead-of-nagios-plugins-all-on-R.patch b/0019-Use-nagios-common-instead-of-nagios-plugins-all-on-R.patch
new file mode 100644
index 0000000..a826c79
--- /dev/null
+++ b/0019-Use-nagios-common-instead-of-nagios-plugins-all-on-R.patch
@@ -0,0 +1,48 @@
+From 248f32c95f3c4b2679bee24f0f8e81ceec1f3f35 Mon Sep 17 00:00:00 2001
+From: James Slagle <jslagle at redhat.com>
+Date: Wed, 10 Dec 2014 12:59:16 -0500
+Subject: [PATCH] Use nagios-common instead of nagios-plugins-all on RHEL.
+
+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.
+
+Change-Id: I8773a93dcd8b348b501d8303ddd211b3edf1e2b9
+---
+ elements/snmpd/install.d/67-snmpd |  4 +++-
+ elements/snmpd/pkg-map            | 10 ++++++++++
+ 2 files changed, 13 insertions(+), 1 deletion(-)
+ create mode 100644 elements/snmpd/pkg-map
+
+diff --git a/elements/snmpd/install.d/67-snmpd b/elements/snmpd/install.d/67-snmpd
+index 69342d0..0294ced 100755
+--- a/elements/snmpd/install.d/67-snmpd
++++ b/elements/snmpd/install.d/67-snmpd
+@@ -1,7 +1,9 @@
+ #!/bin/bash
+ set -eux
+ 
+-install-packages snmpd snmp-mibs-downloader lm-sensors nagios-plugins-basic
++install-packages -m snmpd nagios_plugins_package
++install-packages snmpd snmp-mibs-downloader lm-sensors
++
+ # install our snmp check script
+ DEST_DIR="/usr/lib64/nagios/plugins"
+ if [ ! 'amd64' = "$ARCH" ] || [ ! -d $DEST_DIR ]; then
+diff --git a/elements/snmpd/pkg-map b/elements/snmpd/pkg-map
+new file mode 100644
+index 0000000..44948ed
+--- /dev/null
++++ b/elements/snmpd/pkg-map
+@@ -0,0 +1,10 @@
++{
++  "distro": {
++    "rhel": {
++      "nagios_plugins_package": "nagios-common"
++    }
++  },
++  "default": {
++    "nagios_plugins_package": "nagios-plugins-all"
++  }
++}
diff --git a/openstack-tripleo-image-elements.spec b/openstack-tripleo-image-elements.spec
index 9845fb1..95f9527 100644
--- a/openstack-tripleo-image-elements.spec
+++ b/openstack-tripleo-image-elements.spec
@@ -4,7 +4,7 @@
 Name:		openstack-tripleo-image-elements
 Summary:	OpenStack TripleO Image Elements for diskimage-builder
 Version:	0.8.10
-Release:	15%{?dist}
+Release:	16%{?dist}
 License:	ASL 2.0
 Group:		System Environment/Base
 URL:		https://wiki.openstack.org/wiki/TripleO
@@ -28,6 +28,7 @@ Patch0015: 0015-Set-explicit-route-for-VIPs.patch
 Patch0016: 0016-Fix-horizon-package-install.patch
 Patch0017: 0017-Additional-fixes-for-horizon-package-install.patch
 Patch0018: 0018-Support-RedHatEnterpriseWorkstation-in-add-rule.patch
+Patch0019: 0019-Use-nagios-common-instead-of-nagios-plugins-all-on-R.patch
 
 BuildArch:	noarch
 BuildRequires:	python
@@ -64,6 +65,7 @@ program.
 %patch0016 -p1
 %patch0017 -p1
 %patch0018 -p1
+%patch0019 -p1
 
 %build
 %{__python} setup.py build
@@ -119,6 +121,9 @@ true
 %{_datadir}/tripleo-image-elements
 
 %changelog
+* Mon Jan 05 2015 James Slagle <jslagle at redhat.com> 0.8.10-16
+- Use nagios-common instead of nagios-plugins-all on RHEL.
+
 * Mon Jan 05 2015 James Slagle <jslagle at redhat.com> 0.8.10-15
 - Remove 0 byte patch file
   0016-Use-keepalived-notify-script-if-virtual_interfaces-a.patch