From 5587c299eaedccc0f9eece4c6a9f0d21394a7e3a Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Tue, 23 Jul 2019 20:25:47 +0000
Subject: [PATCH] Re-add gitea01 replacement to inventory

Add new IP addresses to inventory for the rebuild, but don't
reactivate it in the haproxy pools yet.

Note this switches the gitea testing to use a host called gitea99 so
that it doesn't conflict with our changes of the production hosts.

Change-Id: I9779e16cca423bcf514dd3a8d9f14e91d43f1ca3
---
 .zuul.yaml                                           | 4 ++--
 inventory/openstack.yaml                             | 7 +++++++
 playbooks/group_vars/gitea-lb.yaml                   | 4 ++--
 playbooks/remote_puppet_git.yaml                     | 2 +-
 playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2 | 8 ++++----
 testinfra/test_gitea.py                              | 2 +-
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 19b60960ea..21ddb0f5af 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -623,7 +623,7 @@
           label: ubuntu-bionic
         - name: gitea-lb01.opendev.org
           label: ubuntu-bionic
-        - name: gitea01.opendev.org
+        - name: gitea99.opendev.org
           label: ubuntu-bionic
     vars:
       run_playbooks:
@@ -631,7 +631,7 @@
         - playbooks/remote_puppet_git.yaml
       run_test_playbook: playbooks/test-gitea.yaml
     host-vars:
-      gitea01.opendev.org:
+      gitea99.opendev.org:
         host_copy_output:
           '/var/gitea/conf': logs
           '/var/gitea/certs': logs
diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml
index bfe1e13c8e..4c8435a3f7 100644
--- a/inventory/openstack.yaml
+++ b/inventory/openstack.yaml
@@ -167,6 +167,13 @@ all:
         cloud: openstackci-vexxhost
         region_name: sjc1
       public_v4: 38.108.68.124
+    gitea01.opendev.org:
+      ansible_host: 38.108.68.172
+      location:
+        cloud: openstackci-vexxhost
+        region_name: sjc1
+      public_v4: 38.108.68.172
+      public_v6: 2604:e100:3:0:f816:3eff:fe16:274
     gitea02.opendev.org:
       ansible_host: 38.108.68.122
       location:
diff --git a/playbooks/group_vars/gitea-lb.yaml b/playbooks/group_vars/gitea-lb.yaml
index 63d6eabdd9..cebdec61c1 100644
--- a/playbooks/group_vars/gitea-lb.yaml
+++ b/playbooks/group_vars/gitea-lb.yaml
@@ -4,7 +4,7 @@ haproxy_listeners:
       - ':::80'
     servers:
       #- name: 'gitea01.opendev.org'
-      #  address: '38.108.68.93:3080'
+      #  address: '38.108.68.172:3080'
       - name: 'gitea02.opendev.org'
         address: '38.108.68.122:3080'
       - name: 'gitea03.opendev.org'
@@ -24,7 +24,7 @@ haproxy_listeners:
       - ':::443'
     servers:
       #- name: 'gitea01.opendev.org'
-      #  address: '38.108.68.93:3000'
+      #  address: '38.108.68.172:3000'
       - name: 'gitea02.opendev.org'
         address: '38.108.68.122:3000'
       - name: 'gitea03.opendev.org'
diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml
index 3ea1abeb07..2043b98059 100644
--- a/playbooks/remote_puppet_git.yaml
+++ b/playbooks/remote_puppet_git.yaml
@@ -22,7 +22,7 @@
         force: yes
       register: gitinfo
 
-- hosts: "gitea:!disabled"
+- hosts: "gitea:!gitea01.opendev.org:!disabled"
   name: "Create repos on gitea servers"
   strategy: free
   max_fail_percentage: 1
diff --git a/playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2 b/playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2
index 0dbfaab7aa..c6fe4e26fc 100644
--- a/playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2
+++ b/playbooks/zuul/templates/group_vars/gitea-lb.yaml.j2
@@ -3,11 +3,11 @@ haproxy_listeners:
     bind:
       - ":::80"
     servers:
-      - name: "gitea01.opendev.org"
-        address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3080"
+      - name: "gitea99.opendev.org"
+        address: "{{ (hostvars['gitea99.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3080"
   - name: balance_git_https
     bind:
       - ":::443"
     servers:
-      - name: "gitea01.opendev.org"
-        address: "{{ (hostvars['gitea01.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3000"
+      - name: "gitea99.opendev.org"
+        address: "{{ (hostvars['gitea99.opendev.org'] | default({})).get('nodepool', {}).get('public_ipv4', '') }}:3000"
diff --git a/testinfra/test_gitea.py b/testinfra/test_gitea.py
index 137d41f39f..d50160681a 100644
--- a/testinfra/test_gitea.py
+++ b/testinfra/test_gitea.py
@@ -13,7 +13,7 @@
 # under the License.
 
 
-testinfra_hosts = ['gitea01.opendev.org']
+testinfra_hosts = ['gitea99.opendev.org']
 
 
 def test_gitea_listening(host):