From 56a0b08aa5737757f9cf4e3f9757286dd6e83b4e Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Mon, 29 Jul 2019 16:51:41 +0000 Subject: [PATCH] Swap gitea05 into service and bring down 07 and 08 Add the gitea05.opendev.org server into the haproxy pools now that it's been seeded with current data. Switch the create repos task disable list from 05 to 07 and 08, and remove 07 and 08 from the Ansible inventory and comment them out in the haproxy pools in preparation for replacement. To the casual observer it may appear gitea06 is being skipped, but it was replaced first out of sequence due to filesystem corruption during the PTG. The increased performance of the 75% of the nodes which have already been replaced means we can get by doing the final 25% at the same time (so two servers at once). Change-Id: Ia49157c16582b7ed0dbef3eb9d07bf7f1d4450b9 --- inventory/openstack.yaml | 12 ------------ playbooks/group_vars/gitea-lb.yaml | 24 ++++++++++++------------ playbooks/remote_puppet_git.yaml | 2 +- 3 files changed, 13 insertions(+), 25 deletions(-) diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index 902edd7758..043c9e4b6c 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -209,18 +209,6 @@ all: region_name: sjc1 public_v4: 38.108.68.250 public_v6: 2604:e100:3:0:f816:3eff:fe72:b4a9 - gitea07.opendev.org: - ansible_host: 38.108.68.86 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.86 - gitea08.opendev.org: - ansible_host: 38.108.68.22 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.22 grafana02.openstack.org: ansible_host: 2001:4800:7817:104:be76:4eff:fe04:60d5 location: diff --git a/playbooks/group_vars/gitea-lb.yaml b/playbooks/group_vars/gitea-lb.yaml index c177b2aa82..fe844e24f6 100644 --- a/playbooks/group_vars/gitea-lb.yaml +++ b/playbooks/group_vars/gitea-lb.yaml @@ -11,14 +11,14 @@ haproxy_listeners: address: '38.108.68.110:3080' - name: 'gitea04.opendev.org' address: '38.108.68.147:3080' - #- name: 'gitea05.opendev.org' - # address: '38.108.68.55:3080' + - name: 'gitea05.opendev.org' + 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.86:3080' + #- name: 'gitea08.opendev.org' + # address: '38.108.68.22:3080' - name: balance_git_https bind: - ':::443' @@ -31,14 +31,14 @@ haproxy_listeners: address: '38.108.68.110:3000' - name: 'gitea04.opendev.org' address: '38.108.68.147:3000' - #- name: 'gitea05.opendev.org' - # address: '38.108.68.55:3000' + - name: 'gitea05.opendev.org' + 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.86:3000' + #- name: 'gitea08.opendev.org' + # address: '38.108.68.22:3000' iptables_extra_public_tcp_ports: - 443 - 80 diff --git a/playbooks/remote_puppet_git.yaml b/playbooks/remote_puppet_git.yaml index 976bac34e0..49aaa1e4b1 100644 --- a/playbooks/remote_puppet_git.yaml +++ b/playbooks/remote_puppet_git.yaml @@ -23,7 +23,7 @@ force: yes register: gitinfo -- hosts: "gitea:!gitea05.opendev.org:!disabled" +- hosts: "gitea:!gitea07.opendev.org:!gitea08.opendev.org:!disabled" name: "Create repos on gitea servers" strategy: free max_fail_percentage: 1