opendev/system-config
Code Issues Proposed changes

Remove nb04

Browse Source 
This was a host used to transition to docker run nodepool builders. That
transition has been completed for nb01.opendev.org and nb02.opendev.org
and we don't need the third x86 builder.

Change-Id: I93c7fc9b24476527b451415e7c138cd17f3fdf9f
This commit is contained in:
Clark Boylan 2020-09-18 11:12:04 -07:00
parent 98370830a3
commit 9fdbd56d16
5 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
inventory/base/hosts.yaml
View File

@ -564,13 +564,6 @@ all:
region_name: RegionOne region_name: RegionOne
public_v4: 139.178.85.151 public_v4: 139.178.85.151
public_v6: 2604:1380:4111:3e54:f816:3eff:fecf:7903 public_v6: 2604:1380:4111:3e54:f816:3eff:fecf:7903
nb04.opendev.org:
ansible_host: 104.239.240.75
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.239.240.75
public_v6: 2001:4800:7819:104:be76:4eff:fe04:357c
nl01.openstack.org: nl01.openstack.org:
ansible_host: 23.253.99.61 ansible_host: 23.253.99.61
location: location:

4
inventory/service/host_vars/nb04.opendev.org.yaml
View File

@ -1,4 +0,0 @@
letsencrypt_certs:
nb04-opendev-org-main:
- nb04.opendev.org

3
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
View File

@ -134,9 +134,6 @@
- name: letsencrypt updated nb03-opendev-org-main - name: letsencrypt updated nb03-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml 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
# review-dev # review-dev
- name: letsencrypt updated review-dev01-opendev-org-main - name: letsencrypt updated review-dev01-opendev-org-main

10
testinfra/test_nodepool.py
View File

@ -14,7 +14,7 @@
import pytest import pytest
testinfra_hosts = ['nl01.openstack.org', 'nb04.opendev.org'] testinfra_hosts = ['nl01.openstack.org', 'nb01.opendev.org']
def test_clouds_yaml(host): def test_clouds_yaml(host):
@ -40,20 +40,20 @@ def test_launcher_container_running(host):
assert 'nodepool-docker_nodepool-launcher_1' in cmd.stdout assert 'nodepool-docker_nodepool-launcher_1' in cmd.stdout
def test_builder_container_running(host): def test_builder_container_running(host):
if host.backend.get_hostname() != 'nb04.opendev.org': if host.backend.get_hostname() != 'nb01.opendev.org':
pytest.skip() pytest.skip()
cmd = host.run("docker ps -a --format '{{ .Names }}'") cmd = host.run("docker ps -a --format '{{ .Names }}'")
assert 'nodepool-builder-compose_nodepool-builder_1' in cmd.stdout assert 'nodepool-builder-compose_nodepool-builder_1' in cmd.stdout
def test_builder_webserver_running(host): def test_builder_webserver_running(host):
if host.backend.get_hostname() != 'nb04.opendev.org': if host.backend.get_hostname() != 'nb01.opendev.org':
pytest.skip() pytest.skip()
apache = host.service('apache2') apache = host.service('apache2')
assert apache.is_running assert apache.is_running
cmd = host.run('curl --insecure ' cmd = host.run('curl --insecure '
'--resolve nb04.opendev.org:443:127.0.0.1 ' '--resolve nb01.opendev.org:443:127.0.0.1 '
'https://nb04.opendev.org/') 'https://nb01.opendev.org/')
assert 'Index of /' in cmd.stdout assert 'Index of /' in cmd.stdout

4
zuul.d/system-config-run.yaml
View File

@ -251,7 +251,7 @@
label: ubuntu-bionic label: ubuntu-bionic
- name: nl01.openstack.org - name: nl01.openstack.org
label: ubuntu-xenial label: ubuntu-xenial
- name: nb04.opendev.org - name: nb01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
required-projects: required-projects:
- opendev/ansible-role-puppet - opendev/ansible-role-puppet
@ -262,7 +262,7 @@
host_copy_output: host_copy_output:
'/etc/nodepool/nodepool.yaml': logs '/etc/nodepool/nodepool.yaml': logs
'/var/log/nodepool/launcher-debug.log': logs '/var/log/nodepool/launcher-debug.log': logs
nb04.opendev.org: nb01.opendev.org:
host_copy_output: host_copy_output:
'/etc/nodepool/nodepool.yaml': logs '/etc/nodepool/nodepool.yaml': logs
'/var/log/nodepool/builder-debug.log': logs '/var/log/nodepool/builder-debug.log': logs