Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399968 )
Change subject: rancid: convert role to profile
......................................................................
rancid: convert role to profile
Change-Id: Id80efbae80bbabdf50715aba4b16277b417c7b17
---
A modules/profile/manifests/rancid.pp
M modules/role/manifests/rancid.pp
2 files changed, 21 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/68/399968/1
diff --git a/modules/profile/manifests/rancid.pp
b/modules/profile/manifests/rancid.pp
new file mode 100644
index 0000000..632abf3
--- /dev/null
+++ b/modules/profile/manifests/rancid.pp
@@ -0,0 +1,19 @@
+# Really Awful Notorious CIsco config Differ
+class profile::rancid (
+ $active_server = hiera('netmon_server')
+){
+
+ class { '::rancid':
+ active_server => $active_server,
+ }
+
+ backup::set { 'rancid': }
+
+ rsync::quickdatacopy { 'var-lib-rancid':
+ ensure => present,
+ auto_sync => false,
+ source_host => 'netmon2001.wikimedia.org',
+ dest_host => 'netmon1002.wikimedia.org',
+ module_path => '/var/lib/rancid',
+ }
+}
diff --git a/modules/role/manifests/rancid.pp b/modules/role/manifests/rancid.pp
index bb3e70a..723d501 100644
--- a/modules/role/manifests/rancid.pp
+++ b/modules/role/manifests/rancid.pp
@@ -7,20 +7,6 @@
include ::standard
include ::profile::backup::host
-
- backup::set { 'rancid': }
-
- rsync::quickdatacopy { 'var-lib-rancid':
- ensure => present,
- auto_sync => false,
- source_host => 'netmon2001.wikimedia.org',
- dest_host => 'netmon1002.wikimedia.org',
- module_path => '/var/lib/rancid',
- }
-
- $active_server = hiera('netmon_server', 'netmon1002.wikimedia.org')
-
- class { '::rancid':
- active_server => $active_server,
- }
+ include ::profile::base::firewall
+ include ::profile::rancid
}
--
To view, visit https://gerrit.wikimedia.org/r/399968
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id80efbae80bbabdf50715aba4b16277b417c7b17
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
