Giuseppe Lavagetto has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403112 )
Change subject: site.pp: one role per node called with role()
......................................................................
site.pp: one role per node called with role()
Also, a role for the netmon machines is created.
Change-Id: Id7c42905293b7752f74b1e636406ec6bcb0b0f00
---
R hieradata/role/common/netmon.yaml
M manifests/site.pp
A modules/role/manifests/netmon.pp
3 files changed, 18 insertions(+), 3 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/librenms.yaml
b/hieradata/role/common/netmon.yaml
similarity index 100%
rename from hieradata/role/common/librenms.yaml
rename to hieradata/role/common/netmon.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 4397bd6..27c7d68 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1721,13 +1721,13 @@
# network monitoring tools, stretch (T125020, T166180)
node /^netmon(1002|2001)\.wikimedia\.org$/ {
- role(network::monitor, librenms, rancid, smokeping, netbox)
- interface::add_ip6_mapped { 'main': }
+ role(netmon)
}
# jessie VM for servermon until it supports stretch (T170653)
node 'netmon1003.wikimedia.org' {
- role(network::monitor, servermon)
+ role(servermon)
+ include ::role::network::monitor
interface::add_ip6_mapped { 'main': }
}
diff --git a/modules/role/manifests/netmon.pp b/modules/role/manifests/netmon.pp
new file mode 100644
index 0000000..3165daf0
--- /dev/null
+++ b/modules/role/manifests/netmon.pp
@@ -0,0 +1,15 @@
+class role::netmon {
+ system::role { 'netmon':
+ description => 'Network monitoring and management'
+ }
+ # Basic boilerplate for network-related servers
+ require ::role::network::monitor
+ include ::profile::backup::host
+ include ::profile::librenms
+ include ::profile::rancid
+ include ::profile::smokeping
+ include ::profile::netbox
+ include ::profile::prometheus::postgres_exporter
+
+ interface::add_ip6_mapped { 'main': }
+}
--
To view, visit https://gerrit.wikimedia.org/r/403112
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id7c42905293b7752f74b1e636406ec6bcb0b0f00
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
