Merge "paste: move certificate to group variable"

inventory/service/group_vars/paste.yaml

@@ -1,3 +1,8 @@
+letsencrypt_certs:
+  paste-opendev-org-main:
+    - '{{ inventory_hostname }}'
+    - paste.opendev.org
+    - paste.openstack.org
 borg_backup_excludes_extra:
   # live db; dumped with mysqldump
   - /var/lib/lodgeit

inventory/service/host_vars/paste01.opendev.org.yaml

@@ -1,5 +0,0 @@
-letsencrypt_certs:
-  paste01-opendev-org-main:
-    - paste01.opendev.org
-    - paste.opendev.org
-    - paste.openstack.org

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

@@ -165,10 +165,7 @@
 
 # paste
 
-- name: letsencrypt updated paste01-opendev-org-main
-  include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
-
-- name: letsencrypt updated paste99-opendev-org-main
+- name: letsencrypt updated paste-opendev-org-main
   include_tasks: roles/letsencrypt-create-certs/handlers/restart_apache.yaml
 
 # review

playbooks/zuul/templates/host_vars/paste99.opendev.org.yaml.j2

@@ -1,7 +1,2 @@
 lodgeit_secret_key: secretkey
 lodgeit_db_password: password
-letsencrypt_certs:
-  paste99-opendev-org-main:
-    - paste99.opendev.org
-    - paste.opendev.org
-    - paste.openstack.org

zuul.d/infra-prod.yaml

@@ -281,8 +281,7 @@
     files:
       - inventory/base
       - playbooks/service-paste.yaml
-      - inventory/service/host_vars/paste01.opendev.org.yaml
-      - inventory/service/group_vars/paste
+      - inventory/service/group_vars/paste.yaml
       - playbooks/roles/install-docker/
       - playbooks/roles/pip3/
       - playbooks/roles/lodgeit/