From 1b4006757a6d47cc98930361f513212134cbae79 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 30 Sep 2020 11:08:47 +1000 Subject: [PATCH] Cleanup graphite01 Server is replaced with graphite02.opendev.org Change-Id: Ie6099e935a6a7e10c818d1d3003e44bca11dd13a --- hiera/common.yaml | 2 +- inventory/base/hosts.yaml | 7 ------- inventory/service/groups.yaml | 13 ++----------- .../service/host_vars/graphite01.opendev.org.yaml | 4 ---- manifests/site.pp | 15 --------------- .../inventory_plugins/test-fixtures/results.yaml | 5 +---- .../letsencrypt-create-certs/handlers/main.yaml | 3 --- playbooks/service-graphite.yaml | 2 +- 8 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 inventory/service/host_vars/graphite01.opendev.org.yaml diff --git a/hiera/common.yaml b/hiera/common.yaml index 5bcfffb343..da8dcd4618 100644 --- a/hiera/common.yaml +++ b/hiera/common.yaml @@ -228,7 +228,7 @@ cacti_hosts: - gitea07.opendev.org - gitea08.opendev.org - grafana.openstack.org -- graphite01.opendev.org +- graphite02.opendev.org - health.openstack.org - jvb01.opendev.org - kdc03.openstack.org diff --git a/inventory/base/hosts.yaml b/inventory/base/hosts.yaml index 2db4d9ca61..0d38572844 100644 --- a/inventory/base/hosts.yaml +++ b/inventory/base/hosts.yaml @@ -230,13 +230,6 @@ all: region_name: DFW public_v4: 198.101.251.7 public_v6: 2001:4800:7821:102:be76:4eff:fe04:3bad - graphite01.opendev.org: - ansible_host: 162.209.77.51 - location: - cloud: openstackci-rax - region_name: DFW - public_v4: 162.209.77.51 - public_v6: 2001:4800:7818:103:be76:4eff:fe04:763e graphite02.opendev.org: ansible_host: 104.239.240.167 location: diff --git a/inventory/service/groups.yaml b/inventory/service/groups.yaml index cc3a587b2b..2c90c3ecaf 100644 --- a/inventory/service/groups.yaml +++ b/inventory/service/groups.yaml @@ -72,11 +72,7 @@ groups: grafana_opendev: - grafana[0-9]*.opendev.org graphite: - - graphite*.open*.org - # NOTE(ianw) : to be cleaned up once the half-puppet - # graphite01.opendev.org is gone. - graphite_opendev: - - graphite02.opendev.org + - graphite*.opendev.org health: - health[0-9]*.openstack.org jvb: @@ -141,10 +137,6 @@ groups: - ethercalc[0-9]*.open*.org - firehose[0-9]*.open*.org - grafana[0-9]*.open*.org - # TODO(ianw) : this is a weird one we half-converted and moved - # into opendev.org in the early days of opendev. remove when - # graphite02 up. - - graphite01.opendev.org - health[0-9]*.openstack.org - kdc[0-9]*.open*.org - lists*.katacontainers.io @@ -180,7 +172,6 @@ groups: - ethercalc[0-9]*.open*.org - firehose[0-9]*.open*.org - grafana[0-9]*.open*.org - - graphite01.opendev.org - health[0-9]*.openstack.org - kdc[0-9]*.open*.org - lists*.katacontainers.io @@ -237,7 +228,7 @@ groups: - ethercalc[0-9]*.open*.org - etherpad[0-9]*.open*.org - grafana[0-9]*.open*.org - - graphite*.open*.org + - graphite*.opendev.org - health[0-9]*.openstack.org - nb[0-9]*.opendev.org - nl[0-9]*.open*.org diff --git a/inventory/service/host_vars/graphite01.opendev.org.yaml b/inventory/service/host_vars/graphite01.opendev.org.yaml deleted file mode 100644 index ca16d650d0..0000000000 --- a/inventory/service/host_vars/graphite01.opendev.org.yaml +++ /dev/null @@ -1,4 +0,0 @@ -letsencrypt_certs: - graphite01-main: - - graphite01.opendev.org - - graphite.opendev.org diff --git a/manifests/site.pp b/manifests/site.pp index 2e65907938..bf0f78bfca 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -37,21 +37,6 @@ node /^cacti\d+\.open.*\.org$/ { } } -# Node-OS: xenial -node /^graphite\d*\.open.*\.org$/ { - class { 'openstack_project::server': } - - class { '::graphite': - graphite_admin_user => hiera('graphite_admin_user', 'username'), - graphite_admin_email => hiera('graphite_admin_email', 'email@example.com'), - graphite_admin_password => hiera('graphite_admin_password'), - # NOTE(ianw): installed on the host via ansible - ssl_cert_file => '/etc/letsencrypt-certs/graphite01.opendev.org/graphite01.opendev.org.cer', - ssl_key_file => '/etc/letsencrypt-certs/graphite01.opendev.org/graphite01.opendev.org.key', - ssl_chain_file => '/etc/letsencrypt-certs/graphite01.opendev.org/ca.cer', - } -} - # Node-OS: xenial node /^lists\d*\.open.*\.org$/ { class { 'openstack_project::server': } diff --git a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml index b1eb36fa6e..604879b891 100644 --- a/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml +++ b/playbooks/roles/install-ansible/files/inventory_plugins/test-fixtures/results.yaml @@ -18,12 +18,9 @@ results: - puppet - puppet4 - graphite01.opendev.org: - - puppet - - puppet4 + graphite02.opendev.org: - graphite - letsencrypt - - puppet - webservers lists.katacontainers.io: diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml index 6c15d63ebd..0d8a48c9f5 100644 --- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml +++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml @@ -11,9 +11,6 @@ # ("include_tasks" is okay). # https://docs.ansible.com/ansible/latest/porting_guides/porting_guide_2.8.html#imports-as-handlers -- name: letsencrypt updated graphite01-main - include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml - - name: letsencrypt updated graphite02-main include_tasks: roles/letsencrypt-create-certs/handlers/restart_graphite.yaml diff --git a/playbooks/service-graphite.yaml b/playbooks/service-graphite.yaml index e7c31e7c55..76e372db59 100644 --- a/playbooks/service-graphite.yaml +++ b/playbooks/service-graphite.yaml @@ -1,4 +1,4 @@ -- hosts: "graphite_opendev:!disabled" +- hosts: "graphite:!disabled" name: "Base: configure graphite" roles: - iptables