From e70d41fb1d3f3f4a9c0d9ccd9724be91d84b4f12 Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Fri, 7 Apr 2017 18:55:57 -0400
Subject: [PATCH] Remove snmpd from zuul workers

We use snmpd for cacti.o.o today, which our workers do no use. As
such, remove so we can reduce our puppet footprint.

Change-Id: Ic26a8e6f2b2fe3d76c36c4ed7bccd8efb7839858
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 modules/openstack_project/manifests/server.pp   |  9 +++++++++
 modules/openstack_project/manifests/template.pp | 14 ++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp
index 802fb33ed7..3cb506ee9d 100644
--- a/modules/openstack_project/manifests/server.pp
+++ b/modules/openstack_project/manifests/server.pp
@@ -83,12 +83,21 @@ class openstack_project::server (
     }
   }
 
+  include snmpd
 
   class { 'openstack_project::template':
     iptables_public_tcp_ports => $iptables_public_tcp_ports,
     iptables_public_udp_ports => $iptables_public_udp_ports,
     iptables_rules4           => $iptables_rules4,
     iptables_rules6           => $iptables_rules6,
+    snmp_v4hosts              => [
+      '104.239.135.208',
+      '104.130.253.206',
+    ],
+    snmp_v6hosts              => [
+      '2001:4800:7819:104:be76:4eff:fe05:1d6a',
+      '2001:4800:7818:103:be76:4eff:fe04:7ed0',
+    ],
     certname                  => $certname,
     pin_puppet                => $pin_puppet,
     ca_server                 => $ca_server,
diff --git a/modules/openstack_project/manifests/template.pp b/modules/openstack_project/manifests/template.pp
index bff3d8d8cd..e308375aec 100644
--- a/modules/openstack_project/manifests/template.pp
+++ b/modules/openstack_project/manifests/template.pp
@@ -7,6 +7,8 @@ class openstack_project::template (
   $iptables_public_udp_ports = [],
   $iptables_rules4           = [],
   $iptables_rules6           = [],
+  $snmp_v4hosts              = [],
+  $snmp_v6hosts              = [],
   $pin_puppet                = '3.',
   $install_users             = true,
   $install_resolv_conf       = true,
@@ -24,8 +26,6 @@ class openstack_project::template (
 
   ###########################################################
   # Classes for all hosts
-
-  include snmpd
   include sudoers
 
   include openstack_project::params
@@ -60,14 +60,8 @@ class openstack_project::template (
     public_udp_ports => $all_udp,
     rules4           => $iptables_rules4,
     rules6           => $iptables_rules6,
-    snmp_v4hosts     => [
-      '104.239.135.208',
-      '104.130.253.206',
-    ],
-    snmp_v6hosts     => [
-      '2001:4800:7819:104:be76:4eff:fe05:1d6a',
-      '2001:4800:7818:103:be76:4eff:fe04:7ed0',
-    ],
+    snmp_v4hosts     => $snmp_v4hosts,
+    snmp_v6hosts     => $snmp_v6hosts,
   }
 
   class { 'timezone':