Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/81175
Change subject: Until we switch over, still replicate all from manganese
......................................................................
Until we switch over, still replicate all from manganese
Trying to chain replication from manganese -> yttrium -> elsewhere
didn't work the way I wanted. When we switch, we'll just decom
manganese and copy the replication config over to yttrium.
Change-Id: I78ecb2ce79c063152ef45ca23e47899156a78dc9
---
M manifests/role/gerrit.pp
1 file changed, 14 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/81175/1
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index 3078c60..c805d28 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -29,21 +29,6 @@
'threads' => '4',
'mirror' => 'true',
},
- }
- }
- }
-
- class production {
- system_role { 'role::gerrit::production': description =>
'Gerrit master' }
-
- class { "gerrit::instance":
- db_host => 'db1048.eqiad.wmnet',
- host => 'gerrit.wikimedia.org',
- ssh_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==',
- ssl_cert => 'gerrit.wikimedia.org',
- ssl_cert_key => 'gerrit.wikimedia.org',
- smtp_host => 'smtp.pmtpa.wmnet',
- replication => {
# If adding a new entry, remember to add the
fingerprint to gerrit2's known_hosts
# FIXME remove it when all Jenkins jobs have
been migrated to the new
@@ -141,7 +126,20 @@
'mirror' => 'true',
'projects' =>
'operations/software/varnish/varnishkafka',
},
- },
+ }
+ }
+ }
+
+ class production {
+ system_role { 'role::gerrit::production': description =>
'Gerrit master' }
+
+ class { "gerrit::instance":
+ db_host => 'db1048.eqiad.wmnet',
+ host => 'gerrit.wikimedia.org',
+ ssh_key =>
'AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==',
+ ssl_cert => 'gerrit.wikimedia.org',
+ ssl_cert_key => 'gerrit.wikimedia.org',
+ smtp_host => 'smtp.pmtpa.wmnet',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/81175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I78ecb2ce79c063152ef45ca23e47899156a78dc9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Demon <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
