From e711642984d774d37d08f26d79da5629e0a428f4 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Thu, 14 Dec 2017 19:08:14 -0500 Subject: [PATCH] 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 --- manifests/site.pp | 11 ----------- modules/openstack_project/manifests/server.pp | 10 ++-------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/manifests/site.pp b/manifests/site.pp index 91d4fa1f41..2626e76548 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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" diff --git a/modules/openstack_project/manifests/server.pp b/modules/openstack_project/manifests/server.pp index f42fab4a56..418f2cdd52 100644 --- a/modules/openstack_project/manifests/server.pp +++ b/modules/openstack_project/manifests/server.pp @@ -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,