From b327d70f2b141868782a1db7ea0d1b9301c19821 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 13 Mar 2023 08:37:29 -0700 Subject: [PATCH] Remove gitea01-04 from configuration management At this point gitea09-14 should be our only production gitea backends behind haproxy and the only gitea servers replicated to by Gerrit. Additionally, our gitea DB backups should be moved to gitea09 by our depends on change. There shouldn't be any other reason to keep these servers around as long as the new ones are keeping up. Depends-On: https://review.opendev.org/c/opendev/system-config/+/876471 Change-Id: I3d4dfa1682ed1d14c6cd9108fbcbe0bf934b72c7 --- hiera/common.yaml | 4 -- inventory/base/hosts.yaml | 44 ------------------- .../host_vars/gitea01.opendev.org.yaml | 11 ----- .../host_vars/gitea02.opendev.org.yaml | 4 -- .../host_vars/gitea03.opendev.org.yaml | 4 -- .../host_vars/gitea04.opendev.org.yaml | 4 -- .../handlers/main.yaml | 12 ----- 7 files changed, 83 deletions(-) delete mode 100644 inventory/service/host_vars/gitea01.opendev.org.yaml delete mode 100644 inventory/service/host_vars/gitea02.opendev.org.yaml delete mode 100644 inventory/service/host_vars/gitea03.opendev.org.yaml delete mode 100644 inventory/service/host_vars/gitea04.opendev.org.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index d737e2fb8e..59b24c4666 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -16,10 +16,6 @@ cacti_hosts: - eavesdrop01.opendev.org - etherpad01.opendev.org - gitea-lb02.opendev.org -- gitea01.opendev.org -- gitea02.opendev.org -- gitea03.opendev.org -- gitea04.opendev.org - gitea09.opendev.org - gitea10.opendev.org - gitea11.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index b7ea777147..f41c48ad67 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -165,50 +165,6 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDA0Q1rB4LohiDrEEwfQLTdr/9BAsJPgTz1AL5JJFf7re2Prz0bCuvflupfKISgbE1e35mu1NoFdcj8oeZeuTqFfwSvjC8yKwFALZi3XraoffUvh3x85RIFHbJ7heb1kZNtN8yGAMc+mjMU+QBRzTOIiEToQFwbVcrfKsEhpbUE68FLjNXuOyFC+9JPO/T35s+amfKeVaKnzuErD0gXxGw6qDG0j9WD2RmEzbzIIivYDtpigdC06+nEyWOif2CAid7TkLiFreBHmb1pWmybF3dvvM0BE0bqkAehxGbPtKV5KrManUmGqG/F/4N7xW2/UQYgqu6yD53JGqAMWqb3payGKphpxkAF6Gp8yF3fnZhjpopkOzr0oa9JfzC41bdmf06gK7BaGiC7c32V8z09KpwZp2XD79++tqHJLFFCH+tGti/cxdbI48d/CXdHSb/jwybnB/Q3fQTmhYVPl4eWfif275sDSVpoWhUlfnAOUpS+muVubIlXehpAiyaVWCHhro0=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFDl0j5+De1cmxL+X0HOUODWcrUqG1vk+Q7k0BHwiBtGJbxvfL2QgWWvokYZyrNdkZJq0Y0AAwEA6tH47GQ9SGg=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJMh+RSodU5gQtAfEQXdFMFUxYq2SEl4X4u9iIGzbGcZ' - 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 - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXJnJDzJQxVkJ+cacuURNrMYAMAgoQDVOtROFoEhWHmaPmRZxz3GxhvZKWav1XfE2CFb5Hw3hzHh+TRu41DnMwtHX4Ot+1b9z/VMhowUSoyFK32URcZazLsO7Rg2cDeh7IZ/0NKW1Xs+w3wQmrx0hPRHpUw65j7lwDwAPAIwWZdX84gmr2kYJz9mXtqeq8PXqbiAgVbyq8Qqe6WaqiarVCu10l3+G+BcMVGxSDKSi5TEAsFfW6uz6fKrs98OQrpFAlJMkbLd8gXZ4iTP9JI/f3OWRe/N2JIovZs0tnGCHfOvZRKiD0XNnzb76SCkKpOMZnPacnW6DdCEaORRCiVhoJ' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDIRe3IHD0rRgyceGfWnIxorYY8r1uH76GOsK21/ebgL8El0iIKp21DgaoEI5u4Txuxco1p6ON1ydGnY7fHgv7I=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFuwmwYop7KYkCZblZM4SMZ0qQEB0sjGWa2fLlsq/wzq' - gitea02.opendev.org: - ansible_host: 38.108.68.23 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.23 - public_v6: 2604:e100:3:0:f816:3eff:fef9:dcf4 - host_keys: - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHJ4tdMLB1iKE7kOXsCnRxLdgkNjTiX8jrN5uB3/0gP+' - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD9OMJP4x0kNIwfdWdPzEUI1zlRWDvMfNqBbPjIT1oQn30nF6i8itCq/LblkXTo0OTxuykg7ly1Af2JW0HGfbuueEnApw2ww0alu2qcRieASYOC+ZxLF2oRgzRSvg9KTOi882+xKFBppUs5sHQktMmOINJcT4nPs540YTXVkaiznFpumZNdtVtWg53rFGW0w90NhxeaWXK2R+Kx6yT9OCLG8AEdN/b5/2ZIdQtgyUPRxet4NbsghiFEIlrSbBBtEkNZq1QGaugfYt81egBsrlLgo3ratPqS74F1/4oPacXNQAAqccwrbXhc367hJYYaUkcHaDmQjwdIMi2RIajSDKFl' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNxYOkDI6phRwIxMWyBP/EH6YmcuR0HtTKPNyS1Lgo9TihHFOlQX7+GjdDYst2mad6gVn53RUJkAxt9OurFQW54=' - gitea03.opendev.org: - ansible_host: 38.108.68.110 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.110 - public_v6: 2604:e100:3:0:f816:3eff:fe73:673f - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCYp8ubK8DkQqB1qT6B/GPfkAkuSQH90+00yhi5cv7ce2TFuzhjK/cZhvruspHlM32/6ePlO0eVozmZdEzUx0hiKhh8Wc9t7W2utVzBByxCvPWT3HdYKXMyuLM7GPtyJWfqOgjpwEUz37RkbzrdMQGCfkYp+8lG0kmtN1ZocpfBjz3/8lSHruFyxsPNnXISZ170W4nFoMGuyn8LVpBbi9PPoET738ukWa54ozJfYC8GJaElyPwrZljqvwTP+peNY6Up1o0gTCTWq1jxpN8DnXy8FOXII5ChxEhVnrIO/V5axF0hcmk38g9Un+kgBRShf2BS/KkUJksrDWetxMcmUg47' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHcS8+yyJzTHyD5fYuwkk1Yi+PqHoUuhJG7O7E6v3CaX27ab53quv6/oHI1Mi4Qzmy9D8X9i9mmx4MC8t2uYNrU=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPGZvQOLzD6Lf01N9j+DoB4F1oa9eO4V1WqY0/Sw5Iwn' - gitea04.opendev.org: - ansible_host: 38.108.68.147 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.147 - public_v6: 2604:e100:3:0:f816:3eff:fe67:6c38 - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwEGD05NeF9JbZh9th8RlhTQnDaKQZg6pezEi+4ImD1UDNqITwlOmvCvss9YZp8Sg5Eqs/oRxqV2OU2dHh1wCrDbG5SwKQl87hEn+V7sMcg3h0sDuUIzwuPfpfve29YdF6Gbh+Mjjm3qEVQW/Tr8ss8g6BcRjVW7k9hHxiTPVJ6Yh82vRbw4PsLi6XY7joTd7jcswXvBArPNCQM4GQQheee+2m5E/S+lL4iMWYCeLxqaVWHwK2P/LRjWDYy4e9vGHt0Nc0sboF6xz1VGDF5w3W0uqiGyIkbTPJaKyOwFdlsv6OLBO8P94Wq0FkEfbbsA0d0en3bdcpGMDiNQJ99qz/' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEDFJcl+os0cbSa4Um5eR8LlUF2fZCsjjtNGeqF8A5L3' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBJI7NSFRICk2tki7KIU2O2JP2wGo65UeqgjvmsTnue8SM0pYVNmofmOIb0mHOIUocBmQuFWtRANKnoXnjd+M1jE=' gitea09.opendev.org: ansible_host: 38.108.68.113 location: diff --git a/inventory/service/host_vars/gitea01.opendev.org.yaml b/inventory/service/host_vars/gitea01.opendev.org.yaml deleted file mode 100644 index 5bc0b20d63..0000000000 --- a/inventory/service/host_vars/gitea01.opendev.org.yaml +++ /dev/null @@ -1,11 +0,0 @@ -letsencrypt_certs: - gitea01-main: - - gitea01.opendev.org:3000 - - opendev.org -borg_backup_excludes_extra: - # git trees aren't needed - - /var/gitea/data/ - # db is backed up in dumps, don't capture live files - - /var/gitea/db - # backed up by streaming backup - - /var/backups/gitea-mariadb diff --git a/inventory/service/host_vars/gitea02.opendev.org.yaml b/inventory/service/host_vars/gitea02.opendev.org.yaml deleted file mode 100644 index 9caa50573e..0000000000 --- a/inventory/service/host_vars/gitea02.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - gitea02-main: - - gitea02.opendev.org:3000 - - opendev.org diff --git a/inventory/service/host_vars/gitea03.opendev.org.yaml b/inventory/service/host_vars/gitea03.opendev.org.yaml deleted file mode 100644 index bfaadf6e27..0000000000 --- a/inventory/service/host_vars/gitea03.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - gitea03-main: - - gitea03.opendev.org:3000 - - opendev.org diff --git a/inventory/service/host_vars/gitea04.opendev.org.yaml b/inventory/service/host_vars/gitea04.opendev.org.yaml deleted file mode 100644 index 769eb10950..0000000000 --- a/inventory/service/host_vars/gitea04.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - gitea04-main: - - gitea04.opendev.org:3000 - - opendev.org diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index aa1fc546f9..c3eb0cf6b1 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -264,18 +264,6 @@ # We split out handlers for each gitea host as handlers should be run in order # This allows us to do a rolling restart of the gitea backends. -- name: letsencrypt updated gitea01-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml - -- name: letsencrypt updated gitea02-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml - -- name: letsencrypt updated gitea03-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml - -- name: letsencrypt updated gitea04-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml - - name: letsencrypt updated gitea09-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml