diff --git a/hiera/common.yaml b/hiera/common.yaml index 31d00dde10..2b71e55482 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -25,6 +25,9 @@ cacti_hosts: - gitea07.opendev.org - gitea08.opendev.org - gitea09.opendev.org +- gitea10.opendev.org +- gitea11.opendev.org +- gitea12.opendev.org - grafana01.opendev.org - graphite02.opendev.org - jvb01.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 03ce0b5618..5ce8e78b89 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -264,6 +264,39 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCwR4/2rDgH4pKuIMEr4PDjxfVAbxFdf1zfzQwOPlJPVcr9EtiWYuZMxOR8C3e2g09mqd4IFkBy3g78q40/MAQ6vlwEc/brGgSmu8Aipz4JJZRNpFYOl0xjEEMBjKikFN8CsLQv8AMShqu56D/zhmg2M4V71R17lLzaRAYUatwVTB8UHtIZDutuRgQCd26Zm9hV9dr7zKghEF8i7mzMeNQpDTg/M6ncfXCWxEza7o2tgli7WM32DaO5nzS4/xol/2u+aQwulrPkSuyYilpTtzWp+YWUpNrZOmfdss7Sa812O+TickzaJl6A7Mt0FNiu7TcGUdtqEgKFI4yaWwHtbGPqr8Bt5dIRgDEztgSMazL7peCIQZnzYXt7lt8JBabkzx4excqkHtF5E4L1jWfmrvllnL8/+4ql9NYHgxKGi+9ggPc8/s0gJrE6gzd20VLEyqax4n6oUvYHxXmZMxxZT9bW4ndHm/kTuSRlFVAkQU6vXw7JfWkv/62mKr6b9ASNxh8=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBIe2MSzCLvaLRP2FJ7GfJfM61O9sYn42DIbgtfgrFXp2GFy2AbWyjd//q6QzDqhj61Gwd1TF0zGWri69a81BaEM=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEhVn/czIfiRctJQurF6IyFaliNFwye3RBrE2qXlbVpj' + gitea10.opendev.org: + ansible_host: 38.108.68.77 + location: + cloud: openstackci-vexxhost + region_name: sjc1 + public_v4: 38.108.68.77 + public_v6: 2604:e100:3:0:f816:3eff:fe04:bb60 + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDd0iiJIFvj6r3EADIDtTtxOppuDEhuknr3JKcXRxzQIgT9uGpA79QKSfAfLuIzr2Ozq67LHVxhtUeIm/VdXXzjSy803GMjv0DKy8xexA8wzpxqMnEbc0Xr1yeyozYmZ2Q28o2WDugamx33Sg3DXPAP49ezqVp9d2Lk5riwvjLlz7rxqQsgOZeI3DYiIYKyhc40s7HHDsPmIuluxdI3kVbxxBnYg3iv9dJU1IvcJh1u+OIMCwotQ+jHKXGEEa+n1UWDhJaVVCm0thXlHA5fCqwAHSPcmOzpixOGGG6XKtnhIIsiJIL24hjTSzUCnsVYcxwaH4s3kMYB3oVMiCT4T2IaNbEOzZxkHdyof21Px87bvD8/jNbKB9zpacN3817jdynSrc0x9IOdWvHj9SSlS+8CMJXm92HxiLnH1Xw3I38w+p5gn9KSe0U8pnWRQ42b/BKUr2SctBHbr/HHXMduXCkRNpudtCkbHo6tw5mMzC4woR8zCnUydSonq5GxIyNxRcs=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCLvMPG1kc/VBCFSE7q/liSR4OkX/fOeuNSoXblpLtcgFF31eJ4mgjWX3gFa8kcnARlgDEufuhqm8j88v3HEfyA=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINFulmMoQNMvCwcRN/oPvX+kIaWWMkXOFg41UEf6qLRB' + gitea11.opendev.org: + ansible_host: 38.108.68.215 + location: + cloud: openstackci-vexxhost + region_name: sjc1 + public_v4: 38.108.68.215 + public_v6: 2604:e100:3:0:f816:3eff:fee0:4c8d + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCsrLy/IAe5QLmjjflSjGs1mdo30b4YPoaq/gASEmGDda7tjz647IDTZLSMCS1KuWhZC7uSFSQGF2NsHr44WubZtLUtMGJijbyj/E/8Jo0pVpb7OJtvu6fdrcNVleaXKE+ooufH2COu9+FHic21+7ojGOqm97LIWdP1aAAUAfN7UieCvFxBJa++GpcNy7bT5JVw7heEmtyePhOVXLFfbr4qrd8lra8VTGmgfe5ZEPWFTZzIbuHZslSwLS/jrYLpc8T9u8qY1Uj+C5kb7NjBt1oPKykqZwzrGyD7uU9Y5MTHBuV69AEkbeCYhWxGfAJ/cBA6Ewc9GUMKlNtSrw1BCQq9bE/BE3b/wy8LIqNuvyMmT1zfUwOQ7veEqrASr6U/ddSDImd1C9LS8d13EQUAMR4pXUBb0twFhARDQk50BKNDJhx7Ewd9vwCiTki4Un2sdC14s7uCTd162VuFxYI/9NsYP2PRTBwsNliE+waEZCVJGuV0SDUzF53DINCXL8gKUhM=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCLv4FIeH8e99gRPfvgcsKkomuaPW1aR6hedyQpIcwzzcuSDj13yn4qDv0HuI3yqigrkvs5Y1l8htNF8vzBaL+I=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINtuOMo0IIlK5Ti4plfEi9F0i4ZX6a/LrB470pTMlLZ2' + gitea12.opendev.org: + ansible_host: 38.108.68.229 + location: + cloud: openstackci-vexxhost + region_name: sjc1 + public_v4: 38.108.68.229 + public_v6: 2604:e100:3:0:f816:3eff:fec0:12 + host_keys: + - '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' grafana01.opendev.org: ansible_host: 198.101.251.7 location: diff --git a/inventory/service/host_vars/gitea10.opendev.org.yaml b/inventory/service/host_vars/gitea10.opendev.org.yaml new file mode 100644 index 0000000000..33fc6b020a --- /dev/null +++ b/inventory/service/host_vars/gitea10.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + gitea10-main: + - gitea10.opendev.org:3000 + - opendev.org diff --git a/inventory/service/host_vars/gitea11.opendev.org.yaml b/inventory/service/host_vars/gitea11.opendev.org.yaml new file mode 100644 index 0000000000..028328150c --- /dev/null +++ b/inventory/service/host_vars/gitea11.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + gitea11-main: + - gitea11.opendev.org:3000 + - opendev.org diff --git a/inventory/service/host_vars/gitea12.opendev.org.yaml b/inventory/service/host_vars/gitea12.opendev.org.yaml new file mode 100644 index 0000000000..7aba1fc28d --- /dev/null +++ b/inventory/service/host_vars/gitea12.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + gitea12-main: + - gitea12.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 7b6e7f9e8e..3e16c8480f 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -290,3 +290,12 @@ - name: letsencrypt updated gitea09-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml + +- name: letsencrypt updated gitea10-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml + +- name: letsencrypt updated gitea11-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml + +- name: letsencrypt updated gitea12-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_gitea.yaml