Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362127 )
Change subject: netmon: use existing role::network::monitor, clean up site.pp
......................................................................
netmon: use existing role::network::monitor, clean up site.pp
Change-Id: I4511f8215b596947e36c69dd95a37c6736d6f402
---
M manifests/site.pp
M modules/role/manifests/network/monitor.pp
2 files changed, 4 insertions(+), 7 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, but someone else must approve
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index b7bab95..5ed904e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1741,10 +1741,7 @@
# network monitoring tool server
node 'netmon1001.wikimedia.org' {
- role(librenms, servermon::wmf,
- network::monitor)
- include ::passwords::network
- include ::base::firewall
+ role(network::monitor, librenms, servermon::wmf)
interface::add_ip6_mapped { 'main': }
}
@@ -1752,10 +1749,8 @@
# network monitoring tool server - replacement server (T125020)
node 'netmon1002.wikimedia.org' {
# TODO: role(librenms, servermon::wmf)
- role(rancid, smokeping)
+ role(network::monitor, rancid, smokeping)
- include ::passwords::network
- include ::base::firewall
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/network/monitor.pp
b/modules/role/manifests/network/monitor.pp
index cf09c2e..9a02d6c 100644
--- a/modules/role/manifests/network/monitor.pp
+++ b/modules/role/manifests/network/monitor.pp
@@ -1,5 +1,7 @@
class role::network::monitor {
+
include ::standard
include ::base::firewall
+ include ::passwords::network
include ::profile::prometheus::snmp_exporter
}
--
To view, visit https://gerrit.wikimedia.org/r/362127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4511f8215b596947e36c69dd95a37c6736d6f402
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
