opendev/system-config
Code Issues Proposed changes

Merge "Retire nb01/02.openstack.org"

Browse Source
This commit is contained in:
Zuul 2020-05-07 18:00:10 +00:00 committed by Gerrit Code Review
commit b59c9d8a2b
8 changed files with 3 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.zuul.yaml
View File

@ -1266,8 +1266,6 @@
label: ubuntu-bionic
- name: nl01.openstack.org
label: ubuntu-xenial
- name: nb01.openstack.org
label: ubuntu-xenial
- name: nb04.opendev.org
label: ubuntu-bionic
required-projects:
@ -1277,9 +1275,6 @@
nl01.openstack.org:
host_copy_output:
'/etc/nodepool/nodepool.yaml': logs
nb01.openstack.org:
host_copy_output:
'/etc/nodepool/nodepool.yaml': logs
nb04.opendev.org:
host_copy_output:
'/etc/nodepool/nodepool.yaml': logs

2
hiera/common.yaml
View File

@ -257,8 +257,6 @@ cacti_hosts:
- logstash.openstack.org
- nb01.opendev.org
- nb02.opendev.org
- nb01.openstack.org
- nb02.openstack.org
- nb03.openstack.org
- nl01.openstack.org
- nl02.openstack.org

14
inventory/openstack.yaml
View File

@ -590,20 +590,6 @@ all:
region_name: DFW
public_v4: 104.130.124.242
public_v6: 2001:4800:7818:104:be76:4eff:fe02:5608
nb01.openstack.org:
ansible_host: 2001:4800:7818:103:be76:4eff:fe04:9d5a
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.130.253.32
public_v6: 2001:4800:7818:103:be76:4eff:fe04:9d5a
nb02.openstack.org:
ansible_host: 2001:4800:7818:101:be76:4eff:fe04:ef2b
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.130.135.17
public_v6: 2001:4800:7818:101:be76:4eff:fe04:ef2b
nb03.openstack.org:
ansible_host: 139.178.85.141
location:

6
playbooks/group_vars/graphite.yaml
View File

@ -23,12 +23,6 @@ iptables_extra_allowed_hosts:
- hostname: nb02.opendev.org
port: 8125
protocol: udp
- hostname: nb01.openstack.org
port: 8125
protocol: udp
- hostname: nb02.openstack.org
port: 8125
protocol: udp
- hostname: nb03.openstack.org
port: 8125
protocol: udp

2
playbooks/group_vars/zookeeper.yaml
View File

@ -1,8 +1,6 @@
iptables_extra_allowed_hosts:
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb01.opendev.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb02.opendev.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb01.openstack.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb02.openstack.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb03.openstack.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb04.opendev.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nl01.openstack.org'}

7
playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml
View File

@ -59,13 +59,6 @@ results:
- disabled
- puppet
nb01.openstack.org:
- nodepool
- nodepool-builder
- puppet
- puppet4
- webservers
ze01.openstack.org:
- afs-client
- zuul

2
playbooks/service-nodepool.yaml
View File

@ -7,7 +7,7 @@
- configure-openstacksdk
- nodepool-builder
- hosts: 'nb01.openstack.org:nb02.openstack.org:nb03.openstack.org:!disabled'
- hosts: 'nb03.openstack.org:!disabled'
name: "run puppet on all older servers"
strategy: free
roles:

9
testinfra/test_nodepool.py
View File

@ -14,16 +14,11 @@
import pytest
testinfra_hosts = ['nl01.openstack.org', 'nb01.openstack.org',
'nb04.opendev.org']
testinfra_hosts = ['nl01.openstack.org', 'nb04.opendev.org']
def test_clouds_yaml(host):
if host.backend.get_hostname() == 'nb01.openstack.org':
cfg_file = '/home/nodepool/.config/openstack/clouds.yaml'
else:
cfg_file = '/etc/openstack/clouds.yaml'
cfg_file = '/etc/openstack/clouds.yaml'
clouds_yaml = host.file(cfg_file)
assert clouds_yaml.exists