From f204337268a184510644dd53468ed8d95c03f096 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Thu, 7 May 2020 09:10:26 +1000 Subject: [PATCH] Add nb01/nb02 opendev servers These are replacements for the nb01/02.openstack.org puppet servers Change-Id: I376d70ee375289b004fb859751743c6fafa21411 --- doc/source/nodepool.rst | 6 +++--- hiera/common.yaml | 1 + inventory/openstack.yaml | 14 ++++++++++++++ playbooks/group_vars/graphite.yaml | 3 +++ playbooks/group_vars/zookeeper.yaml | 2 ++ playbooks/host_vars/nb01.opendev.org.yaml | 4 ++++ playbooks/host_vars/nb02.opendev.org.yaml | 4 ++++ .../letsencrypt-create-certs/handlers/main.yaml | 6 ++++++ 8 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 playbooks/host_vars/nb01.opendev.org.yaml create mode 100644 playbooks/host_vars/nb02.opendev.org.yaml diff --git a/doc/source/nodepool.rst b/doc/source/nodepool.rst index 14080967bd..b52771ee80 100644 --- a/doc/source/nodepool.rst +++ b/doc/source/nodepool.rst @@ -16,9 +16,9 @@ At a Glance * nl02.openstack.org * nl03.openstack.org * nl04.openstack.org - * nb01.openstack.org - * nb02.openstack.org - * nb03.openstack.org + * nb01.opendev.org + * nb02.opendev.org + * nb03.opendev.org * zk01.openstack.org * zk02.openstack.org * zk03.openstack.org diff --git a/hiera/common.yaml b/hiera/common.yaml index 85d1e717aa..db0f9c2585 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -256,6 +256,7 @@ cacti_hosts: - logstash-worker20.openstack.org - logstash.openstack.org - nb01.opendev.org +- nb02.opendev.org - nb01.openstack.org - nb02.openstack.org - nb03.openstack.org diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index b9cfb3e774..01a339155a 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -576,6 +576,20 @@ all: region_name: us-east public_v4: 108.44.198.34 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: ansible_host: 2001:4800:7818:103:be76:4eff:fe04:9d5a location: diff --git a/playbooks/group_vars/graphite.yaml b/playbooks/group_vars/graphite.yaml index e7536b77a1..98f4da2ff0 100644 --- a/playbooks/group_vars/graphite.yaml +++ b/playbooks/group_vars/graphite.yaml @@ -20,6 +20,9 @@ iptables_extra_allowed_hosts: - hostname: nb01.opendev.org port: 8125 protocol: udp + - hostname: nb02.opendev.org + port: 8125 + protocol: udp - hostname: nb01.openstack.org port: 8125 protocol: udp diff --git a/playbooks/group_vars/zookeeper.yaml b/playbooks/group_vars/zookeeper.yaml index cdbd79a75c..e0255dd20f 100644 --- a/playbooks/group_vars/zookeeper.yaml +++ b/playbooks/group_vars/zookeeper.yaml @@ -1,4 +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'} diff --git a/playbooks/host_vars/nb01.opendev.org.yaml b/playbooks/host_vars/nb01.opendev.org.yaml new file mode 100644 index 0000000000..942b308017 --- /dev/null +++ b/playbooks/host_vars/nb01.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + nb01-opendev-org-main: + - nb01.opendev.org + diff --git a/playbooks/host_vars/nb02.opendev.org.yaml b/playbooks/host_vars/nb02.opendev.org.yaml new file mode 100644 index 0000000000..302690ba79 --- /dev/null +++ b/playbooks/host_vars/nb02.opendev.org.yaml @@ -0,0 +1,4 @@ +letsencrypt_certs: + nb02-opendev-org-main: + - nb02.opendev.org + diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index ff2c9e8dad..9114075dd7 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -121,6 +121,12 @@ # 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