opendev
/
system-config
Code Issues Proposed changes

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:
Paul Belanger 2017-12-14 19:08:14 -05:00
parent 46750e896a
commit e711642984
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
manifests/site.pp
View File

@ -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 /^cacti\d+\.openstack\.org$/ {
$group = "cacti"

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

@ -208,17 +208,11 @@ class openstack_project::server (
include snmpd
# TODO(pabelanger): Clean out old firewall rules
$snmp_v4hosts = [
'104.239.135.208',
'104.130.253.206',
'172.99.116.215',
'172.99.116.215', # cacti02.openstack.org
]
# TODO(pabelanger): Clean out old firewall rules
$snmp_v6hosts = [
'2001:4800:7819:104:be76:4eff:fe05:1d6a',
'2001:4800:7818:103:be76:4eff:fe04:7ed0',
'2001:4800:7821:105:be76:4eff:fe04:b9a5',
'2001:4800:7821:105:be76:4eff:fe04:b9a5', # cacti02.opentsack.org
]
class { 'iptables':
public_tcp_ports => $iptables_public_tcp_ports,