From fd5f32991b16773ffba035ff7257cc1e87c76c8b Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 8 Mar 2023 11:50:36 -0800 Subject: [PATCH] Add gitea13 and gitea14 to inventory This brings out total of new giteas to 6. We noticed today that load skyrocketed on the other four new giteas implying that we need more gitea backends. We think we tracked this down to a bad crawler (doesn't identify itself as such), but we should be able to handle these situations more gracefully. Note that gitea14 recycles gitea08's (now deleted) IP address. Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/876891 Change-Id: Ia0517eabd507a6e8c92205b894014c05a92380d1 --- hiera/common.yaml | 2 ++ inventory/base/hosts.yaml | 22 +++++++++++++++++++ .../host_vars/gitea13.opendev.org.yaml | 4 ++++ .../host_vars/gitea14.opendev.org.yaml | 4 ++++ .../handlers/main.yaml | 6 +++++ 5 files changed, 38 insertions(+) create mode 100644 inventory/service/host_vars/gitea13.opendev.org.yaml create mode 100644 inventory/service/host_vars/gitea14.opendev.org.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index ed1c44f294..d737e2fb8e 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -24,6 +24,8 @@ cacti_hosts: - gitea10.opendev.org - gitea11.opendev.org - gitea12.opendev.org +- gitea13.opendev.org +- gitea14.opendev.org - grafana01.opendev.org - graphite02.opendev.org - jvb01.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 0c4cd77fc4..b7ea777147 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -253,6 +253,28 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDM7DQI8N2EJjsErXepY1z//EnTT66SZS8GokIu/HQJp5wtr7xabsDCaaJmtFSx99sxmkMxTzhmE2DJ5n3pVWFVN8eZahDKu4+Sh3RtsoZ1FQBkMgqbjoFET6eaP/ZP85u2otV0afY/6F9Ft0vcDDh5TVGmSR0ij6wCo9IO3gTX0/4NoTVFHeQ3kKJSiL1bNcyox8U5YYXMhH3+PV5WsCKd/MTJp/2253jbNM4VI9aKazzFiSeNUJ6fXJ/N4aIcdjC7MUMSBZgZxK9znORLo1ln1+I4/MmdBW67cQbUrmQy8k8P1dZZAP+IruAm5JvuHqz+tfpPzLV++Cu7xMOZcmJSmZyeLMhKDqtQnVrG8bxeHrsxZeIqUnlrqDDa48iv7vYcqmlUue82AscjrWak5spCzEoG04XSfDHBsUbApHH/cZaopn9yEeyBOR8jizCvS6RhenP4Fm3SdHIQZqDPTjqbD2psRtQ55S9a8xdjkPOO5EaOPnt1tLrAPrEp48WDS6c=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOcGnWVaH1kmoni22pouL86+t7UNH8n18nV0eHvwwu2ryGsJ9D9p/AE+PWiJWG+dJQz7hpxdiqmv/Op4Sf9XoAo=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK25XzeGo/1TTm7zbk0MmIAWnMHpn99CaelFiamJfrIW' + gitea13.opendev.org: + ansible_host: 38.74.51.139 + location: + cloud: openstackci-vexxhost + region_name: sjc1 + public_v4: 38.74.51.139 + public_v6: 2604:e100:3:0:f816:3eff:fefb:917 + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDAPmBTu+Tazqjme/0On+bVrNntgmXwbw3Ie7Rdt083prJLFACP33jyCGJsQgm+aieKVkxGE7xEtjEiPf/EtJHRyukYs0OQIDuOw1o4IoA6gryC5jGbczZkHsaSAvtxlwreaTkmeT1adGc4GVc1LsmSluNVjTVagAyaHFbhlPGI7cswEvM6dSB9hDItZW6DNQrJeu9FAE6IMn6oYDD/05zVU5kSSeleOrZluT+3lwQ+zU65CsvpCtQ4Q7oMOISI3wgpn6NrcNHYncjwMXanLA8Eut5z7nZrXiJOhRN5f9zeMt/lmUeUow6g/daS+Zxz/dEKxI2reGW7enJVUmWpjD5hL+vR5DH0PHqe6g1F7v3BALtMkIDyN6qP4zCafo8LgauIChuig7wdfzOQWR8pV8LyXzeQsmbfskSftNwH8lgGswOzZiSmZY9LYyOUf2p5PZvsusB00eGm/p0La6sY6z5b4uQBIZR+ynLndyji444wyqHiixUwWt7N8cCA7EnFVbs=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEPgq/mHJ3/0UilxCl4t3s6UW7mpXYQmT3URC61FGPR9Pf3ESc1OZxUJROwsHwh7KWo7wzGCUk1sQYb9J1Cka6A=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINg+lsiP1vsoVGr+JCh+T2tBcj0rVMCfEictj1lZhNN3' + gitea14.opendev.org: + ansible_host: 38.108.68.205 + location: + cloud: openstackci-vexxhost + region_name: sjc1 + public_v4: 38.108.68.205 + public_v6: 2604:e100:3:0:f816:3eff:fe82:4160 + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDbwucdMMhoyxPTBEqWF3WO0uS3OAaAmBZCGVGrzq6BB26HLrzN662rBJ523LWxsbEMVmTCXhBpwfg1JzAxWThe6KjpL30hJPb83VRv1k96Czo3QlQZ+NsKo1paFnNBQnVELcDZoE5+B8NMLK7C8AuUHmpsEyEiyfs4F7mUEp0JD28zt2I5u27eZEsEa5O9iaDEpW/Mduqv2QrxZNyJnfcAy5TRkLBIISuTDy6PaL3bTvpfHOJpe1pG3sqJ80CXNFxnhscTNzgMLjnC1HeUfwqw3OB0ZLKMKJO2yWtGASF6bMDu+0Mqx12LXPEMK4HnWjoZOmUr1uTeL+rY2/4S7CWb4jDIAqtunmWvlt4zvzdSxiq+ZxbLw6EvGUISxZCbY+WsyD4u6WUBEXEnvJb3mhLrrPenLdHC1q9bmB6SEnTcwCYEblDP6gNBwuuJMpoTE9W0KmtraCAxtl+PerpYpCn6ey89y9it5e+Wk4DhV3EyddJNzgeYht6xiQp4SbyoZys=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIC7JmcruitQMiRnYHQioq8gZyZRumY7hZBk+QRE7gltOJbBaSF3pTrvOm3+sn6Pva+/XbPTLRS8b5FnruDZG1Y=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEvPS8qEB6cgsXonbtBS+M8XHFsulxoILphg6edC4PZ8' grafana01.opendev.org: ansible_host: 198.101.251.7 location: diff --git a/inventory/service/host_vars/gitea13.opendev.org.yaml b/inventory/service/host_vars/gitea13.opendev.org.yaml new file mode 100644 index 0000000000..ad08f38332 --- /dev/null +++ b/inventory/service/host_vars/gitea13.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + gitea13-main: + - gitea13.opendev.org:3000 + - opendev.org diff --git a/inventory/service/host_vars/gitea14.opendev.org.yaml b/inventory/service/host_vars/gitea14.opendev.org.yaml new file mode 100644 index 0000000000..5a24666d6f --- /dev/null +++ b/inventory/service/host_vars/gitea14.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + gitea14-main: + - gitea14.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 44ccd05895..aa1fc546f9 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -287,3 +287,9 @@ - name: letsencrypt updated gitea12-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml + +- name: letsencrypt updated gitea13-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml + +- name: letsencrypt updated gitea14-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml