From ba5d9547c8f048a1b94d9d3718f811ca36f76280 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 18 Mar 2020 17:17:40 +1100 Subject: [PATCH] Replace nb01.opendev.org with nb04 We are starting over with the container nodepool host, and also moving it to "nb04" to avoid any possibility of conflicting with the short-hostname of nb01.openstack.org. Story: #2007407 Task: #39064 Depends-On: https://review.opendev.org/713575 Depends-On: https://review.opendev.org/713571 Change-Id: I18ab9834ad4da201774e0abef56f618cd7839d36 --- inventory/openstack.yaml | 14 +++++++------- ...nb01.opendev.org.yaml => nb04.opendev.org.yaml} | 4 ++-- .../letsencrypt-create-certs/handlers/main.yaml | 8 +++++--- 3 files changed, 14 insertions(+), 12 deletions(-) rename playbooks/host_vars/{nb01.opendev.org.yaml => nb04.opendev.org.yaml} (53%) diff --git a/inventory/openstack.yaml b/inventory/openstack.yaml index 3ee61cf87e..05ded3f9dc 100644 --- a/inventory/openstack.yaml +++ b/inventory/openstack.yaml @@ -583,13 +583,6 @@ 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: @@ -611,6 +604,13 @@ all: region_name: RegionOne public_v4: 139.178.85.141 public_v6: '' + nb04.opendev.org: + ansible_host: 2001:4800:7819:104:be76:4eff:fe04:357c + 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: ansible_host: 2001:4800:7815:102:be76:4eff:fe04:645d location: diff --git a/playbooks/host_vars/nb01.opendev.org.yaml b/playbooks/host_vars/nb04.opendev.org.yaml similarity index 53% rename from playbooks/host_vars/nb01.opendev.org.yaml rename to playbooks/host_vars/nb04.opendev.org.yaml index fd29b5cd76..4f707ad6ba 100644 --- a/playbooks/host_vars/nb01.opendev.org.yaml +++ b/playbooks/host_vars/nb04.opendev.org.yaml @@ -1,5 +1,5 @@ ansible_python_interpreter: python3 letsencrypt_certs: - nb01-opendev-org-main: - - nb01.opendev.org + nb04-opendev-org-main: + - nb04.opendev.org diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 37f161b2fa..a5c7b522db 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -86,9 +86,6 @@ - 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 @@ -119,6 +116,11 @@ - name: letsencrypt updated static01-zuul-ci-org include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml +# nodepool + +- name: letsencrypt updated nb04-opendev-org-main + include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml + # review-dev - name: letsencrypt updated review-dev01-opendev-org-main