From 55f657c68da7d4b5ce532de4a86113aa96fca429 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 26 Jul 2019 17:41:55 +0000 Subject: [PATCH] Swap gitea02 into service and bring down gitea03 Add the gitea02.opendev.org server into the haproxy pools now that it's been seeded with current data. Switch the create repos task disable list from 02 to 03, and remove 03 from the Ansible inventory and comment it out in the haproxy pools in preparation for replacement. Change-Id: I4b51291311064c60d4bb2d90bec6e5cb90a54f3c --- 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 eee8e8a688..51dfbc7b0a 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -181,12 +181,6 @@ all: region_name: sjc1 public_v4: 38.108.68.23 public_v6: 2604:e100:3:0:f816:3eff:fef9:dcf4 - gitea03.opendev.org: - ansible_host: 38.108.68.133 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.133 gitea04.opendev.org: ansible_host: 38.108.68.115 location: diff --git a/playbooks/group_vars/gitea-lb.yaml b/playbooks/group_vars/gitea-lb.yaml index 480bc63b25..44dfeacf59 100644 --- a/playbooks/group_vars/gitea-lb.yaml +++ b/playbooks/group_vars/gitea-lb.yaml @@ -5,10 +5,10 @@ haproxy_listeners: servers: - name: 'gitea01.opendev.org' address: '38.108.68.172:3080' - #- name: 'gitea02.opendev.org' - # address: '38.108.68.122:3080' - - name: 'gitea03.opendev.org' - address: '38.108.68.133: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: 'gitea05.opendev.org' @@ -25,10 +25,10 @@ haproxy_listeners: servers: - name: 'gitea01.opendev.org' address: '38.108.68.172:3000' - #- name: 'gitea02.opendev.org' - # address: '38.108.68.122:3000' - - name: 'gitea03.opendev.org' - address: '38.108.68.133: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: 'gitea05.opendev.org' diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index 7a20c463db..144097b187 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -23,7 +23,7 @@ force: yes register: gitinfo -- hosts: "gitea:!gitea02.opendev.org:!disabled" +- hosts: "gitea:!gitea03.opendev.org:!disabled" name: "Create repos on gitea servers" strategy: free max_fail_percentage: 1