From 84b6ec256d11c99adcddf9731fa2786e28984d95 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 14 Apr 2025 09:15:44 -0700 Subject: [PATCH] Unstage review03.opendev.org As part of the preparation for replacing gerrit servers we put the new review03 server in the review-staging group. This prevented it from running manage-projects. We also gave it an empty replication target list to prevent it overwriting gitea git data with stale info. As part of the server switch we need to have this server replicate to gitea and run manage-projects. This change reflects that update and should only be merged when we're sufficientyl into the server swap to be ready for this. Note that review02 could be staged at this point to prevent it from running manage-projects, but as part of the switch review02 goes into the emergency file and my intention is that it never comes back out again. That should be sufficient for preventing manage-projects on the old server. Change-Id: I6d49457b2cb09b6b2b53599db179937eece3fb78 --- inventory/service/groups.yaml | 3 +- .../host_vars/review02.opendev.org.yaml | 50 +----------------- .../host_vars/review03.opendev.org.yaml | 52 +++++++++++++++++-- 3 files changed, 51 insertions(+), 54 deletions(-) diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index 0a9646f62e..236912c711 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -147,8 +147,7 @@ groups: - review[0-9]*.opendev.org # This group disables operations like project-managment and # replication. It is intended for staging new production servers. - review-staging: - - review03.opendev.org + # review-staging: static: - static[0-9]*.opendev.org storyboard: diff --git a/inventory/service/host_vars/review02.opendev.org.yaml b/inventory/service/host_vars/review02.opendev.org.yaml index 6c51f1ec34..677e39e700 100644 --- a/inventory/service/host_vars/review02.opendev.org.yaml +++ b/inventory/service/host_vars/review02.opendev.org.yaml @@ -1,52 +1,4 @@ -gerrit_replication: - - name: 'gitea09' - url: 'ssh://git@gitea09.opendev.org:222/' - authGroup: 'Anonymous Users' - replicationDelay: '1' - replicatePermissions: false - mirror: true - threads: '4' - timeout: '900' - - name: 'gitea10' - url: 'ssh://git@gitea10.opendev.org:222/' - authGroup: 'Anonymous Users' - replicationDelay: '1' - replicatePermissions: false - mirror: true - threads: '4' - timeout: '900' - - name: 'gitea11' - url: 'ssh://git@gitea11.opendev.org:222/' - authGroup: 'Anonymous Users' - replicationDelay: '1' - replicatePermissions: false - mirror: true - threads: '4' - timeout: '900' - - name: 'gitea12' - url: 'ssh://git@gitea12.opendev.org:222/' - authGroup: 'Anonymous Users' - replicationDelay: '1' - replicatePermissions: false - mirror: true - threads: '4' - timeout: '900' - - name: 'gitea13' - url: 'ssh://git@gitea13.opendev.org:222/' - authGroup: 'Anonymous Users' - replicationDelay: '1' - replicatePermissions: false - mirror: true - threads: '4' - timeout: '900' - - name: 'gitea14' - url: 'ssh://git@gitea14.opendev.org:222/' - authGroup: 'Anonymous Users' - replicationDelay: '1' - replicatePermissions: false - mirror: true - threads: '4' - timeout: '900' +gerrit_replication: [] gerrit_serverid: 4a232e18-c5a9-48ee-94c0-e04e7cca6543 gerrit_heap_limit: 96g letsencrypt_certs: diff --git a/inventory/service/host_vars/review03.opendev.org.yaml b/inventory/service/host_vars/review03.opendev.org.yaml index eef06d6ebb..6477bfc43d 100644 --- a/inventory/service/host_vars/review03.opendev.org.yaml +++ b/inventory/service/host_vars/review03.opendev.org.yaml @@ -1,6 +1,52 @@ -# Do not add replication config to the server until we are ready to -# put it into production. -gerrit_replication: [] +gerrit_replication: + - name: 'gitea09' + url: 'ssh://git@gitea09.opendev.org:222/' + authGroup: 'Anonymous Users' + replicationDelay: '1' + replicatePermissions: false + mirror: true + threads: '4' + timeout: '900' + - name: 'gitea10' + url: 'ssh://git@gitea10.opendev.org:222/' + authGroup: 'Anonymous Users' + replicationDelay: '1' + replicatePermissions: false + mirror: true + threads: '4' + timeout: '900' + - name: 'gitea11' + url: 'ssh://git@gitea11.opendev.org:222/' + authGroup: 'Anonymous Users' + replicationDelay: '1' + replicatePermissions: false + mirror: true + threads: '4' + timeout: '900' + - name: 'gitea12' + url: 'ssh://git@gitea12.opendev.org:222/' + authGroup: 'Anonymous Users' + replicationDelay: '1' + replicatePermissions: false + mirror: true + threads: '4' + timeout: '900' + - name: 'gitea13' + url: 'ssh://git@gitea13.opendev.org:222/' + authGroup: 'Anonymous Users' + replicationDelay: '1' + replicatePermissions: false + mirror: true + threads: '4' + timeout: '900' + - name: 'gitea14' + url: 'ssh://git@gitea14.opendev.org:222/' + authGroup: 'Anonymous Users' + replicationDelay: '1' + replicatePermissions: false + mirror: true + threads: '4' + timeout: '900' gerrit_serverid: 4a232e18-c5a9-48ee-94c0-e04e7cca6543 gerrit_heap_limit: 96g letsencrypt_certs: