opendev/system-config
Code Issues Proposed changes

Add nb01/nb02 opendev servers

Browse Source 
These are replacements for the nb01/02.openstack.org puppet servers

Change-Id: I376d70ee375289b004fb859751743c6fafa21411
This commit is contained in:
Ian Wienand 2020-05-07 09:10:26 +10:00
parent f7ba1bd6c2
commit f204337268
8 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/nodepool.rst
View File

@ -16,9 +16,9 @@ At a Glance
* nl02.openstack.org * nl02.openstack.org
* nl03.openstack.org * nl03.openstack.org
* nl04.openstack.org * nl04.openstack.org
* nb01.openstack.org * nb01.opendev.org
* nb02.openstack.org * nb02.opendev.org
* nb03.openstack.org * nb03.opendev.org
* zk01.openstack.org * zk01.openstack.org
* zk02.openstack.org * zk02.openstack.org
* zk03.openstack.org * zk03.openstack.org

1
hiera/common.yaml
View File

@ -256,6 +256,7 @@ cacti_hosts:
- logstash-worker20.openstack.org - logstash-worker20.openstack.org
- logstash.openstack.org - logstash.openstack.org
- nb01.opendev.org - nb01.opendev.org
- nb02.opendev.org
- nb01.openstack.org - nb01.openstack.org
- nb02.openstack.org - nb02.openstack.org
- nb03.openstack.org - nb03.openstack.org

14
inventory/openstack.yaml
View File

@ -576,6 +576,20 @@ all:
region_name: us-east region_name: us-east
public_v4: 108.44.198.34 public_v4: 108.44.198.34
public_v6: 2001:470:e126:0:f816:3eff:fe87:a93 public_v6: 2001:470:e126:0:f816:3eff:fe87:a93
nb01.opendev.org:
ansible_host: 2001:4800:7819:104:be76:4eff:fe04:3fd9
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.239.240.55
public_v6: 2001:4800:7819:104:be76:4eff:fe04:3fd9
nb02.opendev.org:
ansible_host: 2001:4800:7818:104:be76:4eff:fe02:5608
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.130.124.242
public_v6: 2001:4800:7818:104:be76:4eff:fe02:5608
nb01.openstack.org: nb01.openstack.org:
ansible_host: 2001:4800:7818:103:be76:4eff:fe04:9d5a ansible_host: 2001:4800:7818:103:be76:4eff:fe04:9d5a
location: location:

3
playbooks/group_vars/graphite.yaml
View File

@ -20,6 +20,9 @@ iptables_extra_allowed_hosts:
- hostname: nb01.opendev.org - hostname: nb01.opendev.org
port: 8125 port: 8125
protocol: udp protocol: udp
- hostname: nb02.opendev.org
port: 8125
protocol: udp
- hostname: nb01.openstack.org - hostname: nb01.openstack.org
port: 8125 port: 8125
protocol: udp protocol: udp

2
playbooks/group_vars/zookeeper.yaml
View File

@ -1,4 +1,6 @@
iptables_extra_allowed_hosts: 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': 'nb01.openstack.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb02.openstack.org'} - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb02.openstack.org'}
- {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb03.openstack.org'} - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb03.openstack.org'}

4
playbooks/host_vars/nb01.opendev.org.yaml Normal file
View File

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

4
playbooks/host_vars/nb02.opendev.org.yaml Normal file
View File

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

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

@ -121,6 +121,12 @@
# nodepool # 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 - name: letsencrypt updated nb04-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml