Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/358483 )
Change subject: rancid: drop "server" suffix, apply on netmon1002
......................................................................
rancid: drop "server" suffix, apply on netmon1002
Apply the rancid role on netmon1002, migrating from netmon1001.
Drop the "::server" suffix from the role name.
Later this will become a profile and be combined with the other
monitoring tool profiles into a single "role netmon_server" or similar.
Bug: T159756
Change-Id: Ic9d39690a79aa748ed594782a9198b722291a1f0
---
M manifests/site.pp
R modules/role/manifests/rancid.pp
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/83/358483/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 74caf85..9f8252c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2156,7 +2156,7 @@
# network monitoring tool server
node 'netmon1001.wikimedia.org' {
- role(rancid::server, librenms, servermon::wmf, smokeping,
+ role(rancid, librenms, servermon::wmf, smokeping,
network::monitor)
include ::standard
include ::passwords::network
@@ -2172,6 +2172,7 @@
# network monitoring tool server - replacement server (T125020)
node 'netmon1002.wikimedia.org' {
# role(rancid::server, librenms, servermon::wmf, torrus, smokeping)
+ role(rancid)
include ::standard
include ::passwords::network
include ::base::firewall
diff --git a/modules/role/manifests/rancid/server.pp
b/modules/role/manifests/rancid.pp
similarity index 74%
rename from modules/role/manifests/rancid/server.pp
rename to modules/role/manifests/rancid.pp
index 24c8e7e..f0d00b3 100644
--- a/modules/role/manifests/rancid/server.pp
+++ b/modules/role/manifests/rancid.pp
@@ -1,10 +1,11 @@
# Really Awful Notorious CIsco config Differ
-class role::rancid::server {
+class role::rancid {
- system::role { 'rancid::server':
+ system::role { 'rancid':
description => 'Really Awful Notorious CIsco config Differ (sp)'
}
+ include ::standard
include ::rancid
include ::profile::backup::host
--
To view, visit https://gerrit.wikimedia.org/r/358483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9d39690a79aa748ed594782a9198b722291a1f0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
