Dzahn has submitted this change and it was merged. Change subject: Gerrit: Swap lead to point at production data ......................................................................
Gerrit: Swap lead to point at production data - Points at proper hostname and database for lead - Enable replication from lead - Stops replication from ytterbium - switches zuul config from ytterbium to lead Change-Id: I312d405ce964a5b18d5f58815232fd25d5e02c14 --- M hieradata/hosts/lead.yaml M hieradata/hosts/ytterbium.yaml M hieradata/role/common/gerrit/server.yaml M modules/role/manifests/zuul/configuration.pp 4 files changed, 3 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/hieradata/hosts/lead.yaml b/hieradata/hosts/lead.yaml index 0b94583..58f371f 100644 --- a/hieradata/hosts/lead.yaml +++ b/hieradata/hosts/lead.yaml @@ -1,5 +1,2 @@ -gerrit::host: 'gerrit-new.wikimedia.org' -gerrit::jetty::db_host: 'db1042.eqiad.wmnet' -gerrit::jetty::replication: '' role::gerrit::server::ipv4: '208.80.154.85' role::gerrit::server::ipv6: '2620:0:861:3:208:80:154:85' diff --git a/hieradata/hosts/ytterbium.yaml b/hieradata/hosts/ytterbium.yaml index 2c7062b..b3718c7 100644 --- a/hieradata/hosts/ytterbium.yaml +++ b/hieradata/hosts/ytterbium.yaml @@ -9,3 +9,4 @@ gerrit::jetty::git_dir: '/var/lib/gerrit2/review_site/git' gerrit::jetty::index_type: 'SQL' gerrit::proxy::lets_encrypt: false +gerrit::jetty::replication: '' diff --git a/hieradata/role/common/gerrit/server.yaml b/hieradata/role/common/gerrit/server.yaml index 1add1c4..c819391 100644 --- a/hieradata/role/common/gerrit/server.yaml +++ b/hieradata/role/common/gerrit/server.yaml @@ -19,3 +19,4 @@ - '+refs/heads/*:refs/heads/*' - '+refs/tags/*:refs/tags/*' role::gerrit::server::bacula: 'srv-gerrit-git' +gerrit::proxy::maint_mode: '04:00 UTC' diff --git a/modules/role/manifests/zuul/configuration.pp b/modules/role/manifests/zuul/configuration.pp index cf7435c..dbb8445 100644 --- a/modules/role/manifests/zuul/configuration.pp +++ b/modules/role/manifests/zuul/configuration.pp @@ -5,7 +5,7 @@ $shared = { 'production' => { - 'gerrit_server' => 'ytterbium.wikimedia.org', + 'gerrit_server' => 'lead.wikimedia.org', 'gerrit_user' => 'jenkins-bot', 'url_pattern' => 'https://integration.wikimedia.org/ci/job/{job.name}/{build.number}/console', 'status_url' => 'https://integration.wikimedia.org/zuul/', -- To view, visit https://gerrit.wikimedia.org/r/298673 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I312d405ce964a5b18d5f58815232fd25d5e02c14 Gerrit-PatchSet: 8 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Chad <ch...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits