From 0256ba52192404ada876e54a2a0c9ce0adb2bd96 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Sat, 27 Jul 2019 02:07:13 +0000 Subject: [PATCH] Swap gitea03 into service and bring down gitea04 Add the gitea03.opendev.org server into the haproxy pools now that it's been seeded with current data. Switch the create repos task disable list from 03 to 04, and remove 04 from the Ansible inventory and comment it out in the haproxy pools in preparation for replacement. Change-Id: Id5817f8265996862a7e0810b9fb9e3d78be5d066 --- inventory/openstack.yaml | 6 ------ playbooks/group_vars/gitea-lb.yaml | 16 ++++++++-------- playbooks/remote_puppet_git.yaml | 2 +- 3 files changed, 9 insertions(+), 15 deletions(-) diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index a7d0fb3999..9f151cc996 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -188,12 +188,6 @@ all: region_name: sjc1 public_v4: 38.108.68.110 public_v6: 2604:e100:3:0:f816:3eff:fe73:673f - gitea04.opendev.org: - ansible_host: 38.108.68.115 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.115 gitea05.opendev.org: ansible_host: 38.108.68.55 location: diff --git a/playbooks/group_vars/gitea-lb.yaml b/playbooks/group_vars/gitea-lb.yaml index 44dfeacf59..c60fb91632 100644 --- a/playbooks/group_vars/gitea-lb.yaml +++ b/playbooks/group_vars/gitea-lb.yaml @@ -7,10 +7,10 @@ haproxy_listeners: address: '38.108.68.172:3080' - name: 'gitea02.opendev.org' address: '38.108.68.23:3080' - #- name: 'gitea03.opendev.org' - # address: '38.108.68.133:3080' - - name: 'gitea04.opendev.org' - address: '38.108.68.115:3080' + - name: 'gitea03.opendev.org' + address: '38.108.68.110:3080' + #- name: 'gitea04.opendev.org' + # address: '38.108.68.115:3080' - name: 'gitea05.opendev.org' address: '38.108.68.55:3080' - name: 'gitea06.opendev.org' @@ -27,10 +27,10 @@ haproxy_listeners: address: '38.108.68.172:3000' - name: 'gitea02.opendev.org' address: '38.108.68.23:3000' - #- name: 'gitea03.opendev.org' - # address: '38.108.68.133:3000' - - name: 'gitea04.opendev.org' - address: '38.108.68.115:3000' + - name: 'gitea03.opendev.org' + address: '38.108.68.110:3000' + #- name: 'gitea04.opendev.org' + # address: '38.108.68.115:3000' - name: 'gitea05.opendev.org' address: '38.108.68.55:3000' - name: 'gitea06.opendev.org' diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index 144097b187..6592d8221d 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -23,7 +23,7 @@ force: yes register: gitinfo -- hosts: "gitea:!gitea03.opendev.org:!disabled" +- hosts: "gitea:!gitea04.opendev.org:!disabled" name: "Create repos on gitea servers" strategy: free max_fail_percentage: 1