Demon has uploaded a new change for review.
https://gerrit.wikimedia.org/r/52715
Change subject: We don't actually run any slaves, turn formey into a
replicationdest
......................................................................
We don't actually run any slaves, turn formey into a replicationdest
Change-Id: I814e06a3893b2797eb2b8e53a8af1a37c44a96c8
---
M manifests/role/gerrit.pp
M manifests/site.pp
2 files changed, 1 insertion(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/52715/1
diff --git a/manifests/role/gerrit.pp b/manifests/role/gerrit.pp
index 85c688c..ad057a8 100644
--- a/manifests/role/gerrit.pp
+++ b/manifests/role/gerrit.pp
@@ -54,24 +54,6 @@
}
}
- class production::slave {
- system_role { "role::gerrit::slave": description => "Gerrit
slave" }
-
- # It's a full slave, so install gerrit
- class { "gerrit::instance":
- slave => true,
- no_apache => true,
- db_host => "db1048.eqiad.wmnet",
- host => "formey.wikimedia.org",
- }
-
- # Slaves need to be able to recieve replication
- class { "gerrit::replicationdest":
- sshkey =>
"AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==",
- extra_groups => ["gerrit2"]
- }
- }
-
# Include this role on *any* production host that wants to
# receive gerrit replication
class production::replicationdest {
diff --git a/manifests/site.pp b/manifests/site.pp
index e0ad0fb..223f0fa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -742,7 +742,7 @@
$ldapincludes = ['openldap', 'nss', 'utils']
$ssh_tcp_forwarding = "no"
$ssh_x11_forwarding = "no"
- include role::gerrit::production::slave,
+ include role::gerrit::production::replicationdest,
svn::server,
backup::client
--
To view, visit https://gerrit.wikimedia.org/r/52715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I814e06a3893b2797eb2b8e53a8af1a37c44a96c8
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
