Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/364629 )
Change subject: rancid/netmon: add active_server parameter to DC-switch
......................................................................
rancid/netmon: add active_server parameter to DC-switch
Change-Id: I5d8cf0f1d4a8ff8f7365ad0f2155a2c4e095800e
---
M hieradata/common.yaml
M modules/rancid/manifests/init.pp
M modules/role/manifests/rancid.pp
3 files changed, 20 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/29/364629/1
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index ff20792..49ee494 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -467,6 +467,8 @@
install_server: install1002.wikimedia.org
install_server_failover: install2002.wikimedia.org
+netmon_server: netmon1002.wikimedia.org
+
# Etcd client global configuration
etcd_client_srv_domain: "conftool.%{::site}.wmnet"
etcd_host: ''
@@ -484,3 +486,4 @@
tcpircbot_host: 'icinga.wikimedia.org'
tcpircbot_port: 9200
+
diff --git a/modules/rancid/manifests/init.pp b/modules/rancid/manifests/init.pp
index 495630c..d729c05 100644
--- a/modules/rancid/manifests/init.pp
+++ b/modules/rancid/manifests/init.pp
@@ -1,5 +1,7 @@
# Really Awful Notorious CIsco config Differ
-class rancid {
+class rancid (
+ $active_server
+ ){
package { 'rancid':
ensure => present,
@@ -48,16 +50,22 @@
mode => '0440',
content => template('rancid/cloginrc.erb'),
}
+
+ if $active_server == $::fqdn {
+ $cron_ensure = 'present',
+ } else {
+ $cron_ensure = 'absent',
+ }
cron { 'rancid_differ':
- ensure => 'present',
+ ensure => $cron_ensure,
command => 'SSH_AUTH_SOCK=/run/keyholder/proxy.sock
/usr/lib/rancid/bin/rancid-run',
user => 'rancid',
minute => '1',
}
cron { 'rancid_clean_logs':
- ensure => 'present',
+ ensure => $cron_ensure,
command => '/usr/bin/find /var/log/rancid -type f -mtime +2 -exec rm
{} \;',
user => 'rancid',
minute => '50',
diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp
index 504661e..abd49d6 100644
--- a/modules/role/manifests/rancid.pp
+++ b/modules/role/manifests/rancid.pp
@@ -18,4 +18,10 @@
dest_host => 'netmon2001.wikimedia.org',
module_path => '/var/lib/rancid',
}
+
+ $active_server = hiera('netmon_server', 'netmon1002.wikimedia.org')
+
+ class { '::rancid':
+ active_server => $active_server,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/364629
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d8cf0f1d4a8ff8f7365ad0f2155a2c4e095800e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
