opendev/system-config
Code Issues Proposed changes

Deploy grafana02

Browse Source 
This adds a grafana02 server to our inventory with associated LE host
vars. This should deploy grafana on our newly created noble grafana02
server.

Note we switch the system-config-run-grafana job over to interact with
02 to match production. To simplify this effort in the future we convert
the old grafana01 testing host var to a group var file. This change was
already done on bridge.

We will need to followup with at least one change to clean out grafana01
when we are happy with the new server.

Depends-On: https://review.opendev.org/c/opendev/zone-opendev.org/+/940653
Change-Id: Ifd7f83185fbd59935a63973642e9d165bd8105a2
This commit is contained in:
Clark Boylan 2025-02-03 11:41:11 -08:00
parent 680a120bf1
commit b0e396dc21
9 changed files with 25 additions and 3 deletions
hiera
common.yaml
inventory
base
hosts.yaml
service/host_vars
grafana02.opendev.org.yaml
playbooks
roles/letsencrypt-create-certs/handlers
main.yaml
zuul
run-base.yaml
templates/group_vars
grafana.yaml.j2
testinfra
test_grafana.py
zuul.d
infra-prod.yamlsystem-config-run.yaml

1
hiera/common.yaml

@ -24,6 +24,7 @@ cacti_hosts:
- gitea13.opendev.org
- gitea14.opendev.org
- grafana01.opendev.org
- grafana02.opendev.org
- graphite02.opendev.org
- jvb01.opendev.org
- kdc03.openstack.org

11
inventory/base/hosts.yaml

@ -242,6 +242,17 @@ all:
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIINuErqGwtxFWgfg3a44N2z8/pOihQNr5k2LAHTP9cno'
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDJcH3qQHqiAlr0S0Hmr6a6x/WRnc1w6EQn8JhN7tGuN2waWV2bzzJKa8yaOThwH/EkJWk29sa5l1Ig/OXEuy1WnLK9buEEc0LidDn2ekEDyNCuVdQ96Fu1UGhhtOll6sljBzYZAOfMufnSlV+dX0OdiDPvL4Saz0Pf8r//jc87wuPAztQFiPixT/FcIXSrsl265rc8KuaN4rMG9rrQHA5Zpm/mnx2Sap770+C07ygyaQ+HW9gat3LXV7ELvffOvUmIpGFhyQugTmGEhWtEmsg2mPIiFPGOhIKNZPKtHyRxquifb3PlQ8dsx0JOILd1F12gibw2tezsNzqSWswPTwZ9IIW4jWSt9Srk3+dnXIg+J7w23blXbPm4S91a4hBOHGfgEAH9ALsDhCjQ/spto4e4czabDvenHK3vN6/XVK7bcl0wp+j9qKrNNhzYxTwcEJXF/1uTkjfI0mySn8xYQX6wiwW6l7UIyAqcY9+GuYNz0DIXaBO/W3s5CFtmCRQeYy8='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGxJpz56ZCrJXXI3Sv2y1UHOUL18OR3HSV01XcJjSEtKtmqwhmmJnrQp5ax8t34s9OgpMhA8l3KVwDFAtiFBJxE='
grafana02.opendev.org:
ansible_host: 104.239.145.144
location:
cloud: openstackci-rax
region_name: DFW
public_v4: 104.239.145.144
public_v6: 2001:4800:7818:104:be76:4eff:fe04:46cb
host_keys:
- 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCEZ+DFaXALYZpUUEvCK8eJyn4K6HKCp7tofAdbuB6vmKcSSE9klWdcWmHtWATova302ZLNOmb72Q9/2fy5E8PU8uXCWAACn9NGBqMOd7KNKLTP/T6TDrJb73JIru1OQYKqAmqEB2LFyBuBnQnEVOwnTn68ZceayFH/Bqd0GSI8gNEHjE70VTOrZCMaalPz8DTtvy/W5KREQq/nNJvNob10IKTi2aizvaoTrcYdq+JNe8gMSLJxyRmM34cdGMLVapR5V1f5tHyPgpsiQU0+Sdwss7cIots79WUfao4uSIpQX3Bt4VAORTP0JIAb2wwkx/k0UZq9jpkFcxPFykryLkaK4Bkpwpo00TeYzyhS9aejn958DzrZIdynQ76zIksm+Wvkfo1RjrB5vlkunMBo9S7pWF7L8a9p0X9+oyH+idkIO/bydiYzcVrY6yeYjusfxDGHXrdYTP3PlP5x0VJjd1CqaYpuOfEhrWFG7lVSO8PQQVNP/yyHnoK87cuvs30hJTk='
- 'ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBBAr2dMicgpcO8s5mZAbw/hgionUCGpVRsfBBR+sMMAbdlYQ+Z5Y/Qqoaj6VNsLzz49fa+SyRXi91U7Vhpspw/U='
- 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMJdu4aoSyJs6HKhIGBRz0amHBPNK7f4L4s55h5tfplz'
graphite02.opendev.org:
ansible_host: 104.239.240.167
location:

5
inventory/service/host_vars/grafana02.opendev.org.yaml Normal file

@ -0,0 +1,5 @@
letsencrypt_certs:
grafana02-opendev-org-main:
- grafana02.opendev.org
- grafana.opendev.org
- grafana.openstack.org

3
playbooks/roles/letsencrypt-create-certs/handlers/main.yaml

@ -153,6 +153,9 @@
- name: letsencrypt updated grafana01-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
- name: letsencrypt updated grafana02-opendev-org-main
include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
# Codesearch (hound)
- name: letsencrypt updated codesearch01-opendev-org-main

2
playbooks/zuul/run-base.yaml

@ -122,6 +122,7 @@
- group_vars/registry.yaml
- group_vars/gitea.yaml
- group_vars/gitea-lb.yaml
- group_vars/grafana.yaml
- group_vars/kerberos-kdc.yaml
- group_vars/keycloak.yaml
- group_vars/letsencrypt.yaml
@ -146,7 +147,6 @@
- host_vars/letsencrypt01.opendev.org.yaml
- host_vars/letsencrypt02.opendev.org.yaml
- host_vars/gitea99.opendev.org.yaml
- host_vars/grafana01.opendev.org.yaml
- host_vars/mirror01.openafs.provider.opendev.org.yaml
- host_vars/mirror02.openafs.provider.opendev.org.yaml
- host_vars/mirror03.openafs.provider.opendev.org.yaml

0
playbooks/zuul/templates/host_vars/grafana01.opendev.org.yaml.j2 → playbooks/zuul/templates/group_vars/grafana.yaml.j2

2
testinfra/test_grafana.py

@ -16,7 +16,7 @@ from util import take_screenshots
import json
testinfra_hosts = ['grafana01.opendev.org']
testinfra_hosts = ['grafana02.opendev.org']
def test_grafana_container_listening(host):

1
zuul.d/infra-prod.yaml

@ -557,6 +557,7 @@
- inventory/base
- playbooks/service-grafana.yaml
- inventory/service/host_vars/grafana01.org.yaml
- inventory/service/host_vars/grafana02.org.yaml
- inventory/service/group_vars/grafana
- playbooks/roles/install-docker/
- playbooks/roles/pip3/

3
zuul.d/system-config-run.yaml

@ -733,7 +733,7 @@
nodeset:
nodes:
- <<: *bridge_node_x86
- name: grafana01.opendev.org
- name: grafana02.opendev.org
label: ubuntu-noble
groups:
- <<: *bastion_group
@ -750,6 +750,7 @@
- playbooks/roles/install-docker/
- playbooks/roles/pip3/
- playbooks/roles/run-selenium/
- playbooks/zuul/templates/group_vars/grafana
- tesinfra/util.py
- testinfra/test_grafana.py