From 6631b899c5e33761e7f333a1d6b877e658cf11a0 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 29 Jul 2019 23:35:36 +0000
Subject: [PATCH] Put gitea07 and gitea08 back into service

Add the gitea07.opendev.org and gitea08.opendev.org servers into the
haproxy pools now that they've been seeded with current data. Remove
the create repos task disable list entries for them as well.

Change-Id: I69390e6a32b01cc1713839f326fa930c376282af
---
 playbooks/group_vars/gitea-lb.yaml | 16 ++++++++--------
 playbooks/remote_puppet_git.yaml   |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/playbooks/group_vars/gitea-lb.yaml b/playbooks/group_vars/gitea-lb.yaml
index fe844e24f6..c0dc5b61a4 100644
--- a/playbooks/group_vars/gitea-lb.yaml
+++ b/playbooks/group_vars/gitea-lb.yaml
@@ -15,10 +15,10 @@ haproxy_listeners:
         address: '38.108.68.131: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'
-      #  address: '38.108.68.22:3080'
+      - name: 'gitea07.opendev.org'
+        address: '38.108.68.134:3080'
+      - name: 'gitea08.opendev.org'
+        address: '38.108.68.205:3080'
   - name: balance_git_https
     bind:
       - ':::443'
@@ -35,10 +35,10 @@ haproxy_listeners:
         address: '38.108.68.131: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'
-      #  address: '38.108.68.22:3000'
+      - name: 'gitea07.opendev.org'
+        address: '38.108.68.134:3000'
+      - name: 'gitea08.opendev.org'
+        address: '38.108.68.205:3000'
 iptables_extra_public_tcp_ports:
   - 443
   - 80
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index 49aaa1e4b1..9c981c74ec 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -23,7 +23,7 @@
         force: yes
       register: gitinfo
 
-- hosts: "gitea:!gitea07.opendev.org:!gitea08.opendev.org:!disabled"
+- hosts: "gitea:!disabled"
   name: "Create repos on gitea servers"
   strategy: free
   max_fail_percentage: 1