Clean up cacti.o.o node settings
Now that we have migrated to ubuntu-xenial, we can stop testing on trusty. We can also clean out old cacti.o.o and cacti01.o.o firewall rules from our base server.pp. Change-Id: I84b96de40a79d8103cfce5ec121e13a7d01f729d Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
parent
46750e896a
commit
e711642984
@ -140,17 +140,6 @@ node /^stackalytics\d*\.openstack\.org$/ {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
# Node-OS: trusty
|
|
||||||
node 'cacti.openstack.org' {
|
|
||||||
include openstack_project::ssl_cert_check
|
|
||||||
class { 'openstack_project::cacti':
|
|
||||||
sysadmins => hiera('sysadmins', []),
|
|
||||||
cacti_hosts => hiera_array('cacti_hosts'),
|
|
||||||
vhost_name => 'cacti.openstack.org',
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# Node-OS: trusty
|
|
||||||
# Node-OS: xenial
|
# Node-OS: xenial
|
||||||
node /^cacti\d+\.openstack\.org$/ {
|
node /^cacti\d+\.openstack\.org$/ {
|
||||||
$group = "cacti"
|
$group = "cacti"
|
||||||
|
@ -208,17 +208,11 @@ class openstack_project::server (
|
|||||||
|
|
||||||
include snmpd
|
include snmpd
|
||||||
|
|
||||||
# TODO(pabelanger): Clean out old firewall rules
|
|
||||||
$snmp_v4hosts = [
|
$snmp_v4hosts = [
|
||||||
'104.239.135.208',
|
'172.99.116.215', # cacti02.openstack.org
|
||||||
'104.130.253.206',
|
|
||||||
'172.99.116.215',
|
|
||||||
]
|
]
|
||||||
# TODO(pabelanger): Clean out old firewall rules
|
|
||||||
$snmp_v6hosts = [
|
$snmp_v6hosts = [
|
||||||
'2001:4800:7819:104:be76:4eff:fe05:1d6a',
|
'2001:4800:7821:105:be76:4eff:fe04:b9a5', # cacti02.opentsack.org
|
||||||
'2001:4800:7818:103:be76:4eff:fe04:7ed0',
|
|
||||||
'2001:4800:7821:105:be76:4eff:fe04:b9a5',
|
|
||||||
]
|
]
|
||||||
class { 'iptables':
|
class { 'iptables':
|
||||||
public_tcp_ports => $iptables_public_tcp_ports,
|
public_tcp_ports => $iptables_public_tcp_ports,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user