Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/298052
Change subject: WIP: Gerrit: Remove SSH public key and last user of it
......................................................................
WIP: Gerrit: Remove SSH public key and last user of it
DO NOT MERGE UNTIL GERRIT IS UPGRADED
Gerrit now supports doing its own garbage cleaning. Stop
using this hack to trigger it.
Change-Id: I8455189c964cfd2f49521db88980073f1f0b9b5b
---
M hieradata/role/common/gerrit/server.yaml
M modules/gerrit/manifests/crons.pp
2 files changed, 1 insertion(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/52/298052/1
diff --git a/hieradata/role/common/gerrit/server.yaml
b/hieradata/role/common/gerrit/server.yaml
index e73fd44..c966862 100644
--- a/hieradata/role/common/gerrit/server.yaml
+++ b/hieradata/role/common/gerrit/server.yaml
@@ -7,7 +7,6 @@
role::gerrit::server::host: 'gerrit.wikimedia.org'
gerrit::proxy::ssl_cert: '%{::role::gerrit::server::host}'
gerrit::proxy::ssl_cert_key: '%{::role::gerrit::server::host}'
-gerrit::crons::ssh_key: 'ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
gerrit@production'
gerrit::jetty::replication:
github:
url: 'g...@github.com:wikimedia/${name}'
diff --git a/modules/gerrit/manifests/crons.pp
b/modules/gerrit/manifests/crons.pp
index db30302..f1c985a 100644
--- a/modules/gerrit/manifests/crons.pp
+++ b/modules/gerrit/manifests/crons.pp
@@ -1,12 +1,4 @@
-class gerrit::crons($ssh_key) {
-
- # TODO: Make this go away -- need to stop using gerrit2 for hook actions
- ssh::userkey { 'gerrit2':
- ensure => present,
- content => $ssh_key,
- require => Package['gerrit'],
- }
-
+class gerrit::crons() {
cron { 'list_mediawiki_extensions':
# Gerrit is missing a public list of projects.
# This hack list MediaWiki extensions repositories
--
To view, visit https://gerrit.wikimedia.org/r/298052
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8455189c964cfd2f49521db88980073f1f0b9b5b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
