[MediaWiki-commits] [Gerrit] WIP: Move more of the gerrit config out of role class and in... - change (operations/puppet)

[Chad (Code Review)]

Chad has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296622

Change subject: WIP: Move more of the gerrit config out of role class and into 
hiera
......................................................................

WIP: Move more of the gerrit config out of role class and into hiera

Change-Id: I03eb44cfcdddbaea72ed15234d72a55f33b70cc7
---
M hieradata/role/common/gerrit/production.yaml
A hieradata/role/eqiad/gerrit/production.yaml
M modules/role/manifests/gerrit/production.pp
3 files changed, 5 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/296622/1

diff --git a/hieradata/role/common/gerrit/production.yaml 
b/hieradata/role/common/gerrit/production.yaml
index 98b01a8..f2bfc7e 100644
--- a/hieradata/role/common/gerrit/production.yaml
+++ b/hieradata/role/common/gerrit/production.yaml
@@ -4,3 +4,7 @@
 debdeploy::grains:
   debdeploy-gerrit:
     value: standard
+gerrit::host: 'gerrit.wikimedia.org'
+gerrit::ssl_cert: "${gerrit::host}"
+gerrit::ssl_cert_key: "${gerrit::host}"
+gerrit::ssk_key: 'ssh-rsa 
AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production'
diff --git a/hieradata/role/eqiad/gerrit/production.yaml 
b/hieradata/role/eqiad/gerrit/production.yaml
new file mode 100644
index 0000000..4861428
--- /dev/null
+++ b/hieradata/role/eqiad/gerrit/production.yaml
@@ -0,0 +1 @@
+gerrit::db_host: "m2-master.eqiad.wmnet"
diff --git a/modules/role/manifests/gerrit/production.pp 
b/modules/role/manifests/gerrit/production.pp
index c2d3155..8012906 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/production.pp
@@ -45,11 +45,6 @@
         ]
 
         class { '::gerrit':
-            db_host      => 'm2-master.eqiad.wmnet',
-            host         => 'gerrit.wikimedia.org',
-            ssh_key      => 'ssh-rsa 
AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
 gerrit@production',
-            ssl_cert     => 'gerrit.wikimedia.org',
-            ssl_cert_key => 'gerrit.wikimedia.org',
             smtp_host    => $::mail_smarthost[0],
             replication  => {
                 # If adding a new entry, remember to add the fingerprint to 
gerrit2's known_hosts
@@ -73,5 +68,4 @@
                 # results in Code Search. See T70054.
             }
         }
-
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/296622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I03eb44cfcdddbaea72ed15234d72a55f33b70cc7
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