From 6baa9dca5cad45b90a99d53ea3ba5d97ee17e70a Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Wed, 26 Jun 2019 16:36:57 -0700
Subject: [PATCH] Put gitea06 back in the rotation
This server was replaced and has had its db restored from backup on
gitea01, repo dirs recreated via gitea admin ui function, and gerrit has
replicated all repo content to this server.
Put this back into the rotation in haproxy as well as the ansible
management of gitea git repos.
Change-Id: I424d0db0adf0787d5d46e264b6552d79b48f27ef
---
playbooks/group_vars/gitea-lb.yaml | 4 ++++
playbooks/remote_puppet_git.yaml | 4 +---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/playbooks/group_vars/gitea-lb.yaml b/playbooks/group_vars/gitea-lb.yaml
index 1bdc410c17..4aa25eefbe 100644
--- a/playbooks/group_vars/gitea-lb.yaml
+++ b/playbooks/group_vars/gitea-lb.yaml
@@ -13,6 +13,8 @@ haproxy_listeners:
address: '38.108.68.115:3080'
- name: 'gitea05.opendev.org'
address: '38.108.68.55:3080'
+ - name: 'gitea06.opendev.org'
+ address: '38.108.68.250:3080'
- name: 'gitea07.opendev.org'
address: '38.108.68.86:3080'
- name: 'gitea08.opendev.org'
@@ -31,6 +33,8 @@ haproxy_listeners:
address: '38.108.68.115:3000'
- name: 'gitea05.opendev.org'
address: '38.108.68.55:3000'
+ - name: 'gitea06.opendev.org'
+ address: '38.108.68.250:3000'
- name: 'gitea07.opendev.org'
address: '38.108.68.86:3000'
- name: 'gitea08.opendev.org'
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index 28587dbfe0..2f9bfcb948 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -22,9 +22,7 @@
force: yes
register: gitinfo
-# We exclude gitea06 because we want to recover its database from a sibgling
-# node in order to preserve the redirects.
-- hosts: "gitea:!gitea06.opendev.org:!disabled"
+- hosts: "gitea:!disabled"
name: "Create repos on gitea servers"
strategy: free
max_fail_percentage: 1