From 8b42a38df2fc2f904c030df04ba45e6f7e4a7a71 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 10 Jan 2023 15:07:45 +1100 Subject: [PATCH] Add nb04.opendev.org This is a replacement ARM64 builder for nb03. Add basic config Change-Id: I42889d3acfb269687dcc9731c04c8eae9ace2cfa --- doc/source/nodepool.rst | 1 + hiera/common.yaml | 1 + inventory/base/hosts.yaml | 10 ++++++++++ inventory/service/host_vars/nb04.opendev.org.yaml | 6 ++++++ .../roles/letsencrypt-create-certs/handlers/main.yaml | 3 +++ 5 files changed, 21 insertions(+) create mode 100644 inventory/service/host_vars/nb04.opendev.org.yaml diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index fa77ecb5c1..6af8a1c11a 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -19,6 +19,7 @@ At a Glance * nb01.opendev.org * nb02.opendev.org * nb03.opendev.org + * nb04.opendev.org * zk04.opendev.org * zk05.opendev.org * zk06.opendev.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 4ecc93c990..1c27b66f0e 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -34,6 +34,7 @@ cacti_hosts: - nb01.opendev.org - nb02.opendev.org - nb03.opendev.org +- nb04.opendev.org - nl01.opendev.org - nl02.opendev.org - nl03.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index ba1eed9092..6f31288581 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -545,6 +545,16 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDlJ/BpaQ0B2995wGP9KhOd59Hh0wTqCDSsM8spvXuxuuLHF7gu+tlaQVG5h+CHHm3WqXO9Zq7NmnyokQOTm0LU9fm699Ij3viwd4RDTqLFCW0/AntqZFd0dxOlcIwi/qgKrtDTaKVVtyAygGDBeSEcUqZVvVEJBaxqJgrMsXPv8IjodirUG6rpzMV6rO1pISy02G0Fcey4VdEw4q+r666zX7eplhg45HA+sKt6oJJSKcvjAAGKPfXA8b0XmUOSvDzUH/5NPVwUcuB1ttJ+VRIsGriBANPXL7V4sd/wJmDjMfXTPvjsyIdaSAAM47nxdxVKPVwACFxhXvgTeOXbQDCZ' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBDJ/BRGRA2w7guMLu2v37K1iUt+JqJVAnR2vPcMGq39NeMAROqSpbadG3djwkSHT6b78q56Wl86mr5AuYjBKkcc=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIjV1j8fZM0q/mjBkuzM8et4vopiF0rm9Nao9Knz+PtV' + nb04.opendev.org: + ansible_host: 140.211.169.52 + location: + cloud: opendevci-osuosl + region_name: RegionOne + public_v4: 140.211.169.52 + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDSmH8Z7z8ejDVJzOfF68tXI6Im37qH+5gGQtg7xwcYxNMDco/jYZ1SyfVvJGiAmFp1OFG2ZVIqtFuzOJOwLN6dbA5t+IEC6a4dMXlawMQNPrAyISvE6eIU1CNYzU1tbBmDh+1WWB4K8tC7zEXJPc12GbHB7syvJq5MoFLH3qNNqUF6P2ls4NwFzo/TonEWOk8ajtgAWurKtUd9TCiAiKPy5irpRNRJQYTT7ZD+g4Z+LMRCkJF+UxOM0ubxh7OufPRS9ZflPZmC8BqaJazRkVS/Dtv+zJn9tYFnZ4w9C1sfxiMTjDHmrpbRfCYRx3Q+l4+2KRYRn9RGDClZttugpRqw0IEXkqyOTUChNsjpgw1HDv3U3U4f2NT4e+2EOXLehfC/lROZ1Ck0w1vg+7YPko8kkpXXmF5wUPXHlSJr6zvFNUByFSBC5x9NCz76dMPDXYkyMi/kN/58B8CPcBObiRmjOQz3qVfpyLNiQDZqxPlVOlDt+pPjwDnB5OCrNdTDre0=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBHApRdup9wYJyWmY/38+yweY6IQecA4XHSpdy6A+diuYyNtPXb+pKOd7yIJa0k2yqr7xZZb07JSZTIFELZ1vxIQ=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILVJQlsfOLQFGtjvLWv1QPgNuDC9r3maCBmr9IwU3QFm' nl01.opendev.org: ansible_host: 104.239.144.109 location: diff --git a/inventory/service/host_vars/nb04.opendev.org.yaml b/inventory/service/host_vars/nb04.opendev.org.yaml new file mode 100644 index 0000000000..1bda7b9e30 --- /dev/null +++ b/inventory/service/host_vars/nb04.opendev.org.yaml @@ -0,0 +1,6 @@ +letsencrypt_certs: + nb04-opendev-org-main: + - nb04.opendev.org +# This host only does ARM64 builds/uploads. Limit the uploads to +# happen one at a time. +nodepool_builder_upload_workers: 1 diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index dc89884991..359ddfc200 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -166,6 +166,9 @@ - name: letsencrypt updated nb03-opendev-org-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml +- name: letsencrypt updated nb04-opendev-org-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml + # paste - name: letsencrypt updated paste-opendev-org-main