From 476c3ac6f285ac99c871d0ebb0ddcb46cccf82f1 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Tue, 31 Mar 2020 12:18:48 +1100
Subject: [PATCH] Remove inventory references to <static|files>.openstack.org
These hosts have been removed; remove the old references and
unnecessary groups, add the new host to cacti.
Change-Id: Ibcfd78a37e20e514c190ef801c2d44320c8b3f74
Story: #2006598
---
hiera/common.yaml | 1 +
inventory/groups.yaml | 9 +--------
playbooks/service-static.yaml | 2 +-
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/hiera/common.yaml b/hiera/common.yaml
index 40e3d8a627..509aeb9eea 100644
--- a/hiera/common.yaml
+++ b/hiera/common.yaml
@@ -320,6 +320,7 @@ cacti_hosts:
- mirror-update.openstack.org
- review-dev01.opendev.org
- review.openstack.org
+- static01.opendev.org
- status01.openstack.org
- storyboard01.opendev.org
- storyboard-dev01.opendev.org
diff --git a/inventory/groups.yaml b/inventory/groups.yaml
index c9cbb31fa9..f313f62562 100644
--- a/inventory/groups.yaml
+++ b/inventory/groups.yaml
@@ -70,7 +70,6 @@ groups:
- nb[0-9]*.opendev.org
- review-dev[0-9]*.open*.org
- review[0-9]*.open*.org
- - static.openstack.org
- static[0-9]*.opendev.org
- zuul[0-9]*.open*.org
logstash:
@@ -141,7 +140,6 @@ groups:
- pbx[0-9]*.opendev.org
- planet[0-9]*.open*.org
- refstack*.open*.org
- - static*.openstack.org
- status*.open*.org
- storyboard-dev[0-9]*.opendev.org
- storyboard[0-9]*.opendev.org
@@ -187,7 +185,6 @@ groups:
- pbx[0-9]*.opendev.org
- planet[0-9]*.open*.org
- refstack*.open*.org
- - static*.openstack.org
- status*.open*.org
- storyboard[0-9]*.opendev.org
- storyboard-dev[0-9]*.opendev.org
@@ -210,10 +207,6 @@ groups:
review:
- review[0-9]*.open*.org
static:
- - static*.openstack.org
- # NOTE(ianw): 2019-12 : rename below when static.openstack.org is
- # gone
- static_opendev:
- static[0-9]*.opendev.org
status:
- status*.open*.org
@@ -248,7 +241,7 @@ groups:
- paste[0-9]*.open*.org
- planet[0-9]*.open*.org
- refstack*.open*.org
- - static*.open*.org
+ - static[0-9]*.opendev.org
- status*.open*.org
- storyboard-dev[0-9]*.opendev.org
- storyboard[0-9]*.opendev.org
diff --git a/playbooks/service-static.yaml b/playbooks/service-static.yaml
index 5a739cdfa7..a425036101 100644
--- a/playbooks/service-static.yaml
+++ b/playbooks/service-static.yaml
@@ -1,4 +1,4 @@
-- hosts: "static_opendev:!disabled"
+- hosts: "static:!disabled"
name: "Static webserver"
roles:
- role: kerberos-client