From 5f0e06963a2ed4c98de39cd23d2c8d5eed268979 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Mon, 15 Jan 2024 14:50:51 +1100
Subject: [PATCH] Use group var to define letsencrypt_certs

Change-Id: Ibcc11bd4fb120a046b428fe3c6eb9ba8505495d0
---
 inventory/service/group_vars/meetpad.yaml                  | 7 +++++++
 inventory/service/host_vars/meetpad01.opendev.org.yaml     | 4 ----
 .../roles/letsencrypt-create-certs/handlers/main.yaml      | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)
 delete mode 100644 inventory/service/host_vars/meetpad01.opendev.org.yaml

diff --git a/inventory/service/group_vars/meetpad.yaml b/inventory/service/group_vars/meetpad.yaml
index 7fb4550fd5..3e0f415a80 100644
--- a/inventory/service/group_vars/meetpad.yaml
+++ b/inventory/service/group_vars/meetpad.yaml
@@ -7,3 +7,10 @@ iptables_extra_public_udp_ports:
 iptables_extra_allowed_groups:
   - {'protocol': 'tcp', 'port': '5222', 'group': 'jvb'}
   - {'protocol': 'tcp', 'port': '9090', 'group': 'meetpad'}
+letsencrypt_certs:
+  # NOTE: Order is important!  LE/driver.sh will write the file to the
+  # first entry in this list.  The jitsi_meet handler wants that to be the
+  # inventotu_hostname
+  meetpad-opendev-org-main:
+    - '{{ inventory_hostname }}'
+    - meetpad.opendev.org
diff --git a/inventory/service/host_vars/meetpad01.opendev.org.yaml b/inventory/service/host_vars/meetpad01.opendev.org.yaml
deleted file mode 100644
index 82fc801113..0000000000
--- a/inventory/service/host_vars/meetpad01.opendev.org.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-letsencrypt_certs:
-  meetpad01-main:
-    - meetpad01.opendev.org
-    - meetpad.opendev.org
diff --git a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
index 284adc4f8d..206402889f 100644
--- a/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
+++ b/playbooks/roles/letsencrypt-create-certs/handlers/main.yaml
@@ -38,7 +38,7 @@
 - name: letsencrypt updated insecure-ci-registry99-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_zuul_registry.yaml
 
-- name: letsencrypt updated meetpad01-main
+- name: letsencrypt updated meetpad-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_jitsi_meet.yaml
 
 # mailman