From dbe0bf1ee6e1d300d768317026a571999199cd5f Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 6 Nov 2019 16:26:47 +1100 Subject: [PATCH] Add nb01.opendev.org This configures an opendev nodepool-builder Change-Id: Id8603d9d7caaac0a1ab935e1c7c80d32b02ae23e Depends-On: https://review.opendev.org/693118 --- hiera/common.yaml | 1 + inventory/openstack.yaml | 7 +++++++ playbooks/group_vars/graphite.yaml | 3 +++ playbooks/group_vars/zookeeper.yaml | 1 + playbooks/host_vars/nb01.opendev.org.yaml | 5 +++++ .../roles/letsencrypt-create-certs/handlers/main.yaml | 3 +++ 6 files changed, 20 insertions(+) create mode 100644 playbooks/host_vars/nb01.opendev.org.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index 798b288445..4fd2749098 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -281,6 +281,7 @@ cacti_hosts: - logstash-worker19.openstack.org - logstash-worker20.openstack.org - logstash.openstack.org +- nb01.opendev.org - nb01.openstack.org - nb02.openstack.org - nb03.openstack.org diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index b99dd2acec..3ee61cf87e 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -583,6 +583,13 @@ 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:7818:101:be76:4eff:fe04:4909 + location: + cloud: openstackci-rax + region_name: DFW + public_v4: 104.130.135.172 + public_v6: 2001:4800:7818:101:be76:4eff:fe04:4909 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 4095441a83..e7536b77a1 100644 --- a/playbooks/group_vars/graphite.yaml +++ b/playbooks/group_vars/graphite.yaml @@ -17,6 +17,9 @@ iptables_extra_allowed_hosts: - hostname: logstash.openstack.org port: 8125 protocol: udp + - hostname: nb01.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 2b464fcadc..119f73a99b 100644 --- a/playbooks/group_vars/zookeeper.yaml +++ b/playbooks/group_vars/zookeeper.yaml @@ -1,4 +1,5 @@ iptables_extra_allowed_hosts: + - {'protocol': 'tcp', 'port': '2181', 'hostname': 'nb01.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..fd29b5cd76 --- /dev/null +++ b/playbooks/host_vars/nb01.opendev.org.yaml @@ -0,0 +1,5 @@ +ansible_python_interpreter: python3 +letsencrypt_certs: + nb01-opendev-org-main: + - nb01.opendev.org + diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index d346633670..1397ee31b2 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -83,6 +83,9 @@ - name: letsencrypt updated static01-keystone-openstack-org include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml +- name: letsencrypt updated nb01-opendev-org-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml + - name: letsencrypt updated static01-nova-openstack-org include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml