From daab4ea6cd26d6500aa5ca9a083f588b6bdd00b0 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Fri, 21 Oct 2022 07:46:35 -0700 Subject: [PATCH] Remove gitea-lb01 and jvb02 from our inventory gitea-lb01 has been replaced by gitea-lb02. Reviewers should double check the new gitea-lb02 server appears happy to them before approving this change. Approving this change will be the last step required before we delete gitea-lb01 entirely. jvb02 is one of two additional jitsi meet jvb servers (on top of the one running in the all in one meetpad install) deployed to help scale up our jitsi meet server. The current October 2022 PTG has shown that while meetpad has been useful to a small number of team there isn't the concurrent demand that having extra jvbs like this supports. This means we can scale back as the PTG is expected to be our largest load on the service. Do both of these in the same change as they update the inventory file which causes all of our infra-prod jobs to run which takes a long time. Squashing the changes together ensures we turn that around in half the time. Change-Id: I5e8b23ba9a8dc389cd7ef7f294ba4b0f8048102b --- hiera/common.yaml | 2 -- inventory/base/hosts.yaml | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/hiera/common.yaml b/hiera/common.yaml index 84d5c4650f..97f145e77b 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -15,7 +15,6 @@ cacti_hosts: - cacti.openstack.org - eavesdrop01.opendev.org - etherpad01.opendev.org -- gitea-lb01.opendev.org - gitea-lb02.opendev.org - gitea01.opendev.org - gitea02.opendev.org @@ -28,7 +27,6 @@ cacti_hosts: - grafana01.opendev.org - graphite02.opendev.org - jvb01.opendev.org -- jvb02.opendev.org - kdc03.openstack.org - kdc04.openstack.org - keycloak01.opendev.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 600b01c8c3..58c7d205ac 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -98,12 +98,6 @@ all: region_name: DFW public_v4: 104.130.124.120 public_v6: 2001:4800:7818:104:be76:4eff:fe02:b0ff - gitea-lb01.opendev.org: - ansible_host: 38.108.68.124 - location: - cloud: openstackci-vexxhost - region_name: sjc1 - public_v4: 38.108.68.124 gitea-lb02.opendev.org: ansible_host: 38.108.68.66 location: @@ -195,13 +189,6 @@ all: region_name: DFW public_v4: 174.143.130.41 public_v6: 2001:4800:7819:104:be76:4eff:fe04:53f1 - jvb02.opendev.org: - ansible_host: 104.130.158.233 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 104.130.158.233 - public_v6: 2001:4800:7818:104:be76:4eff:fe04:48c7 keycloak01.opendev.org: ansible_host: 104.130.135.124 location: