Dzahn has submitted this change and it was merged.
Change subject: Gerrit: Rename role from ::production to ::server
......................................................................
Gerrit: Rename role from ::production to ::server
It's not quite useful outside of production yet, but it's way closer
and the class name doesn't do it any favors.
Change-Id: I10cbf711debaf8b8509d5dabd246d7d2ce072270
---
R hieradata/role/common/gerrit/server.yaml
R hieradata/role/eqiad/gerrit/server.yaml
M manifests/site.pp
R modules/role/manifests/gerrit/server.pp
4 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/role/common/gerrit/production.yaml
b/hieradata/role/common/gerrit/server.yaml
similarity index 81%
rename from hieradata/role/common/gerrit/production.yaml
rename to hieradata/role/common/gerrit/server.yaml
index 01faef8..0eb5f16 100644
--- a/hieradata/role/common/gerrit/production.yaml
+++ b/hieradata/role/common/gerrit/server.yaml
@@ -4,9 +4,9 @@
debdeploy::grains:
debdeploy-gerrit:
value: standard
-role::gerrit::production::host: 'gerrit.wikimedia.org'
-gerrit::proxy::ssl_cert: '%{::role::gerrit::production::host}'
-gerrit::proxy::ssl_cert_key: '%{::role::gerrit::production::host}'
+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::jetty::ssh_key: 'ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEAxOlshfr3UaPr8gQ8UVskxHAGG9xb55xDyfqlK7vsAs/p+OXpRB4KZOxHWqI40FpHhW+rFVA0Ugk7vBK13oKCB435TJlHYTJR62qQNb2DVxi5rtvZ7DPnRRlAvdGpRft9JsoWdgsXNqRkkStbkA5cqotvVHDYAgzBnHxWPM8REokQVqil6S/yHkIGtXO5J7F6I1OvYCnG1d1GLT5nDt+ZeyacLpZAhrBlyFD6pCwDUhg4+H4O3HGwtoh5418U4cvzRgYOQQXsU2WW5nBQHE9LXVLoL6UeMYY4yMtaNw207zN6kXcMFKyTuF5qlF5whC7cmM4elhAO2snwIw4C3EyQgw==
gerrit@production'
gerrit::jetty::replication:
github:
diff --git a/hieradata/role/eqiad/gerrit/production.yaml
b/hieradata/role/eqiad/gerrit/server.yaml
similarity index 100%
rename from hieradata/role/eqiad/gerrit/production.yaml
rename to hieradata/role/eqiad/gerrit/server.yaml
diff --git a/manifests/site.pp b/manifests/site.pp
index 22d71b9..73bd034 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2900,7 +2900,7 @@
node 'ytterbium.wikimedia.org' {
# Note: whenever moving Gerrit out of ytterbium, you will need
# to update the role::zuul::configuration variable 'gerrit_server'
- role gerrit::production
+ role gerrit::server
include standard
interface::add_ip6_mapped { 'main': }
diff --git a/modules/role/manifests/gerrit/production.pp
b/modules/role/manifests/gerrit/server.pp
similarity index 80%
rename from modules/role/manifests/gerrit/production.pp
rename to modules/role/manifests/gerrit/server.pp
index 4484956..bd3aeec 100644
--- a/modules/role/manifests/gerrit/production.pp
+++ b/modules/role/manifests/gerrit/server.pp
@@ -1,6 +1,6 @@
# modules/role/manifests/gerrit/production.pp
-class role::gerrit::production($host) {
- system::role { 'role::gerrit::production': description => 'Gerrit
master' }
+class role::gerrit::server($host) {
+ system::role { 'role::gerrit::server': description => 'Gerrit server' }
include role::backup::host
include base::firewall
@@ -13,12 +13,12 @@
backup::set { 'var-lib-gerrit2-review_site-git': }
- interface::ip { 'role::gerrit::production_ipv4':
+ interface::ip { 'role::gerrit::server_ipv4':
interface => 'eth0',
address => '208.80.154.81',
prefixlen => '32',
}
- interface::ip { 'role::gerrit::production_ipv6':
+ interface::ip { 'role::gerrit::server_ipv6':
interface => 'eth0',
address => '2620:0:861:3:208:80:154:81',
prefixlen => '128',
--
To view, visit https://gerrit.wikimedia.org/r/296936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10cbf711debaf8b8509d5dabd246d7d2ce072270
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <ch...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
