From 43e14bd406b58ec5b555dbf673b3be27afa6c2d1 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 19 Mar 2025 10:36:01 -0700 Subject: [PATCH] Add nb07 to the inventory This is a new Noble arm64 nodepool builder. It will replace nb04. The depends on changes ensure LetsEncrypt can issue certs and that we will deploy with the correct nodepool builder config when this change lands. Depends-On: https://review.opendev.org/c/openstack/project-config/+/945034 Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/945035 Change-Id: I88c09cd9e0b06ca91cef8fb44ad5cac052236a75 --- doc/source/nodepool.rst | 2 +- hiera/common.yaml | 1 + inventory/base/hosts.yaml | 10 ++++++++++ inventory/service/host_vars/nb03.opendev.org.yaml | 6 ------ inventory/service/host_vars/nb07.opendev.org.yaml | 6 ++++++ .../roles/letsencrypt-create-certs/handlers/main.yaml | 3 +++ 6 files changed, 21 insertions(+), 7 deletions(-) delete mode 100644 inventory/service/host_vars/nb03.opendev.org.yaml create mode 100644 inventory/service/host_vars/nb07.opendev.org.yaml diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index 15542173b3..ec72fc68c6 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -18,10 +18,10 @@ At a Glance * nl04.opendev.org * nb01.opendev.org * nb02.opendev.org - * nb03.opendev.org * nb04.opendev.org * nb05.opendev.org * nb06.opendev.org + * nb07.opendev.org * zk04.opendev.org * zk05.opendev.org * zk06.opendev.org diff --git a/hiera/common.yaml b/hiera/common.yaml index bc64d44381..8c20666804 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -36,6 +36,7 @@ cacti_hosts: - nb04.opendev.org - nb05.opendev.org - nb06.opendev.org +- nb07.opendev.org - nl01.opendev.org - nl02.opendev.org - nl03.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 6f004397f3..22b6bff603 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -523,6 +523,16 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDKvg+5aeKi42FOWmpqLwU9Qq6w1grGRiTcLsKfz+1UswPX7ocj5ExKZyx3sr9O7Pu2hqar9u1s3GQ+bVLVJW3L6NyoGsAr/g6It4QkUOo2P2X7f36Kc4aKQLwWqoRv7Sb7t/4RWo+sDYm38Wacv7ITz3VbF4cUDEdh/Gj9NC9BVdTgXT9GhGRJJeDSw6s+U9V4dY350VY0QmcQ2spwpRe7BZYS8Uc1r5BYHP0PnG5h1+FEt9edvvd8sVe92OVaUV0e3GZ5JfoAB1KlPt4iuszRh5E7YWPpI5P9hO5l8I0CcaX1W4q2UuvJGuOCU9ZoOI4xhUzuY2x3BzVrqhJDyLNDL5BraZrGZAEMpW758hzCnTnDZ/i+5yucglm4O3EJUSeVI0AQIxfy/sySLOaGHPop2bnXj0qbCFC/NA8ixUAjrL2wQx+728rkxVPpvSGY2cPDLVM6t4HxAc2m92EKunCdXal/B65bqdPLjX4z+QrnwBd4v7lumon2phOVg2g9ueU=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBInRkNCTHCYNqrXeBxkw7Xo1JAsESbMHTpBH8iMSOMAZHL+Bwe4ya7Q1VO4ks1Ej02nsHqzB0F7tzWQzrorwyH0=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGO/ynjygOoVBxSOTdjbNi/s6gMIclQVgBrNjJZrYtg/' + nb07.opendev.org: + ansible_host: 140.211.169.46 + location: + cloud: opendevci-osuosl + region_name: RegionOne + public_v4: 140.211.169.46 + host_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCv4t4b/vyQ3G15ewMEAaM5ilNqIp2FyhAc8hnfKiCdXOaFQB1vKn4fboS0MN6haXYDHAhZyLTYdSxlbKdxD8+tl6rYKrw3MuAobp1v42fW3Z+WtLTg4YfK+OycPmhC6dtsx/rUHs2ykhtTxBgTvtI4OxUeT9SCrUqChNFHDN0zxikL6XdC8YoWT5nM+QzBmHqPAQ6IeMqH2DDsYeNjomj3mTdV1M6rh2uNcFmgQ5Sl/uHbeTI0YJfjri7/XVdUI91JwexuRTVBVwDehWJZUM02Asb+2klEws7RW7TJsrLLv2auKOVgrHJho0cua3hdfQRAgE0PCzL3KnQWewb1mJHlGZfiNaw477VU+nFPkE/TGeDbesB+vYPnqiOd0NB5kJsr00M5J+QW3tnlqqnswhF8YdIpbZr1oDBvXPU/CBw1el3rV7AUaAVx1RNdZx3o8z3yu5Yezh2agWMn99OdO8koXiaayMLmw7RxB2dhve6Unhb5A6ONlmdRQJIfzzSjbsU=' + - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKeNhXbXm9V63Y0fmx+ZkYWHkRONzLako4F3UTfrpJH11OmlKthb/Xn4JYi1AKXs9ilaiQlFalzbBnu4Ja/MfkE=' + - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBRX/Dsps3s/7cjYbbCGvwTm3TS9N04KsFm98/uN/Nld' nl01.opendev.org: ansible_host: 104.239.144.109 location: diff --git a/inventory/service/host_vars/nb03.opendev.org.yaml b/inventory/service/host_vars/nb03.opendev.org.yaml deleted file mode 100644 index 4d46c29c62..0000000000 --- a/inventory/service/host_vars/nb03.opendev.org.yaml +++ /dev/null @@ -1,6 +0,0 @@ -letsencrypt_certs: - nb03-opendev-org-main: - - nb03.opendev.org -# This host only does ARM64 builds/uploads and is not super powerful. -# Limit the uploads to happen one at a time. -nodepool_builder_upload_workers: 1 diff --git a/inventory/service/host_vars/nb07.opendev.org.yaml b/inventory/service/host_vars/nb07.opendev.org.yaml new file mode 100644 index 0000000000..9027ae8caa --- /dev/null +++ b/inventory/service/host_vars/nb07.opendev.org.yaml @@ -0,0 +1,6 @@ +letsencrypt_certs: + nb07-opendev-org-main: + - nb07.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 f6b4686191..9afe0961bf 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -175,6 +175,9 @@ - name: letsencrypt updated nb06-opendev-org-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml +- name: letsencrypt updated nb07-opendev-org-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml + # paste - name: letsencrypt updated paste-opendev-org-main