opendev
/
system-config
Code Issues Proposed changes

Merge "Remove snmpd from zuul workers"

This commit is contained in:
Jenkins 2017-04-10 15:54:28 +00:00 committed by Gerrit Code Review
parent 88629e814b e70d41fb1d
commit 68964aa940
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/openstack_project/manifests/server.pp
View File

@ -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,

14
modules/openstack_project/manifests/template.pp
View File

@ -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':