diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index ec72fc68c6..3c83e45ac3 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -16,9 +16,6 @@ At a Glance * nl02.opendev.org * nl03.opendev.org * nl04.opendev.org - * nb01.opendev.org - * nb02.opendev.org - * nb04.opendev.org * nb05.opendev.org * nb06.opendev.org * nb07.opendev.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 8c20666804..95e91d2273 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -31,9 +31,6 @@ cacti_hosts: - keycloak01.opendev.org - keycloak03.opendev.org - lists01.opendev.org -- nb01.opendev.org -- nb02.opendev.org -- nb04.opendev.org - nb05.opendev.org - nb06.opendev.org - nb07.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 22b6bff603..96fa0a376a 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -469,38 +469,6 @@ all: - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDvcw2waOMbEAZE/sjEroZAYm529ulZdS9s3sNs496Fqy9+cvUYz0yQ7ILCgb+oF1yhnJJOn6QvBa5JZnaK4t6RZ3nc2K9iHeOJFoVHBoT7aD82jL6UKK7atdPJNSdlfb/NRkPAQmlE38pd6NLlG+O8/F/GD+XpQsBtE08HyCgEtqlOOszfHTvTzs0jfskJ11Xxe/hzi2GliYY6b9eWdndh/ND/M2ynmLmx645oNn6U7lQ5CnaT7819QNhXBLlyoLzQpkyc3KhJFl9TZrmjVvrzZqPTmSQNilKobbstVaeQ66DQYdAjkrxxXiNQs4VZhu0fG8DsWmiA/XfzpglzSVSRqWunGpbbAcY0LyfCionZbo+RJ11gTRxhgAGEudWlVhOSA8RNQdxtXjw3yoG4KJISeSiiJSRWt1MSAHLLLkvEaDM8qrUSxvEYRLbFIqZxo0Jwsr3BsO0q3PKnPPY02g9y1SUWmlD+UfyVHGz8L5HrRrsYNm9ar+jtzFWC/k3ON/k=' - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBCt9SY765OzM6DJ/h907uqAivJMFFO+0FRYdCwP7FWkqeSphap3GEkcr+dzZl1beUpPGYkAIyAYFR16i0U8VTmI=' - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICb1VqqZO5/dmFaq2IBKFPd6KT+aZr6VeomZw+ysmg7P' - nb01.opendev.org: - ansible_host: 104.239.240.55 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.239.240.55 - public_v6: 2001:4800:7819:104:be76:4eff:fe04:3fd9 - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD64PtEOlPZtsbaj+i0CrTwWZ9SwrQ1ajPZ/+5qDeZ+bPsF1D7D/U2vamSuujsiH4uOPzM4zURj90B1qq1Ksm6ZD+tRF3X2ALAse8mK9zSKFzw+ptZvOlKmkV5Wyf609JRNAif1At1uItMHdRzPKHkKITdtpWRs1r47nviB0rFBgf26ErivIbaV41+C0MclO2Rxozkk2FbhXILaHkKdQ63Qi8/tnKkghTIiE5CXkpWGeRVtFNpCR23I3ZPCWaJtg5KUKZdaUdWGDW2cxQ4uQ9GOb0M2DQis6OJ0YjUuPvZKN7jTnMJIQglOWT23WUqSIxno1vwm9xgfwg5i5kg9h8EF' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOABj4GxFrc5atLYlqESdMfSXe4DzVt6LEKdhvGXGyNrA1lVnBl5uRgPsq/EenXG0lNXzou0mvl3wZ8xA87oybw=' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIcGfkQH3LjigxAw/ZmrH3VKjByWLoqGAvG9ZcmAaF/3' - nb02.opendev.org: - ansible_host: 104.130.124.242 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.130.124.242 - public_v6: 2001:4800:7818:104:be76:4eff:fe02:5608 - host_keys: - - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC9Dk9EahNusWDMjPyDId6dI81yLn3tk1kt4CjewBpivjcbOwCSHcRcgrZZiyT11ACSwKfP0VbLUitmcKAeVnZq5XhoLZu1Ze9br/RtiIw6bk45LF2U0xFV/0e+0FgQjxurg2sqKB1ElNceCGzqNMz5E00YcuyGxMQBYIaE1oAn8sm1CP4M24z9jxNe3LVdGzHkl3EngaRuJ3kOqZZG3TWJZC+quYJ875ECq1kcRy9rjYrxFvm0Y2Q71MnBfXRmj6ZQ8SkbWINto4rn9AaFv65nIQYHHQTJ5adKVevzrHWivhZ12SFrT8IUj/OYOB+NyLmITE3DxTVpHfHS5a9XlSYJ' - - 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOjKTobdTgQVhtzR2NrVTlgP6uWkitLWUzDkgfhBlqK7' - - 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBITv+E5xj1BbUQs0Hm71r3y3F6nS2LFfyW9T0BPHiipkaPvN0fw7nW2YbdMRot+j7Sp57W8Ctc/NU7Vy2PBqiJ8=' - 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' nb05.opendev.org: ansible_host: 104.130.253.28 location: diff --git a/inventory/service/host_vars/nb01.opendev.org.yaml b/inventory/service/host_vars/nb01.opendev.org.yaml deleted file mode 100644 index 942b308017..0000000000 --- a/inventory/service/host_vars/nb01.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - nb01-opendev-org-main: - - nb01.opendev.org - diff --git a/inventory/service/host_vars/nb02.opendev.org.yaml b/inventory/service/host_vars/nb02.opendev.org.yaml deleted file mode 100644 index 302690ba79..0000000000 --- a/inventory/service/host_vars/nb02.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - nb02-opendev-org-main: - - nb02.opendev.org - diff --git a/inventory/service/host_vars/nb04.opendev.org.yaml b/inventory/service/host_vars/nb04.opendev.org.yaml deleted file mode 100644 index 1bda7b9e30..0000000000 --- a/inventory/service/host_vars/nb04.opendev.org.yaml +++ /dev/null @@ -1,6 +0,0 @@ -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 9afe0961bf..88ecf855c6 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -160,15 +160,6 @@ # nodepool -- name: letsencrypt updated nb01-opendev-org-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - -- name: letsencrypt updated nb02-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 - - name: letsencrypt updated nb05-opendev-org-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml diff --git a/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 b/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 index f112702104..75407b431f 100644 --- a/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/nodepool-builder/templates/docker-compose.yaml.j2 @@ -1,5 +1,3 @@ -version: '2' - services: nodepool-builder: image: quay.io/zuul-ci/nodepool-builder:{{ nodepool_builder_container_tag|default('latest') }}