From f27c170d01d2f4ccd6c6c85ce9c840eb344c9d43 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 28 May 2020 16:43:14 -0500 Subject: [PATCH] Rename service-letsencrypt to just letsencrypt This isn't a service, it's a meta thing that we run for different hosts at different times. Change-Id: Ib65665c98afb3ddb94b15346931be88a4b1757d8 --- doc/source/letsencrypt.rst | 4 +-- ...vice-letsencrypt.yaml => letsencrypt.yaml} | 0 zuul.d/infra-prod.yaml | 20 ++++++------- zuul.d/project.yaml | 6 ++-- zuul.d/system-config-run.yaml | 30 +++++++++---------- 5 files changed, 30 insertions(+), 30 deletions(-) rename playbooks/{service-letsencrypt.yaml => letsencrypt.yaml} (100%) diff --git a/doc/source/letsencrypt.rst b/doc/source/letsencrypt.rst index 2d397038aa..c8af78508f 100644 --- a/doc/source/letsencrypt.rst +++ b/doc/source/letsencrypt.rst @@ -12,7 +12,7 @@ At a Glance =========== :Ansible: - * :git_file:`playbooks/service-letsencrypt.yaml` + * :git_file:`playbooks/letsencrypt.yaml` * :git_file:`playbooks/roles/letsencrypt-acme-sh-install` * :git_file:`playbooks/roles/letsencrypt-request-certs` * :git_file:`playbooks/roles/letsencrypt-install-txt-record` @@ -30,7 +30,7 @@ We support automatic provisioning of certificates from Let's Encrypt to hosts in the ``opendev.org`` domain. This is implemented in OpenDev via the roles driven from -:git_file:`playbooks/roles/service-letsencrypt.yaml`. The overall +:git_file:`playbooks/letsencrypt.yaml`. The overall actions implemented by the above roles are roughly: * Hosts that want a certificate use the ``amce.sh`` tool to request it diff --git a/playbooks/service-letsencrypt.yaml b/playbooks/letsencrypt.yaml similarity index 100% rename from playbooks/service-letsencrypt.yaml rename to playbooks/letsencrypt.yaml diff --git a/zuul.d/infra-prod.yaml b/zuul.d/infra-prod.yaml index 7087a89f11..132a09df65 100644 --- a/zuul.d/infra-prod.yaml +++ b/zuul.d/infra-prod.yaml @@ -61,17 +61,17 @@ - playbooks/roles/base/ - job: - name: infra-prod-service-letsencrypt + name: infra-prod-letsencrypt parent: infra-prod-playbook - description: Run service-letsencrypt.yaml playbook. + description: Run letsencrypt.yaml playbook. vars: - playbook_name: service-letsencrypt.yaml + playbook_name: letsencrypt.yaml dependencies: - name: infra-prod-install-ansible soft: true files: - inventory/ - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml # Any touching of host_vars or group_vars can substantively # change the certs we're doing, so be greedy here. - playbooks/host_vars/ @@ -103,7 +103,7 @@ dependencies: - name: infra-prod-install-ansible soft: true - - name: infra-prod-service-letsencrypt + - name: infra-prod-letsencrypt soft: true - job: @@ -206,7 +206,7 @@ dependencies: - name: infra-prod-install-ansible soft: true - - name: infra-prod-service-letsencrypt + - name: infra-prod-letsencrypt soft: true - name: system-config-promote-image-jitsi-meet soft: true @@ -344,7 +344,7 @@ dependencies: - name: infra-prod-install-ansible soft: true - - name: infra-prod-service-letsencrypt + - name: infra-prod-letsencrypt soft: true - name: infra-prod-manage-projects soft: true @@ -370,7 +370,7 @@ dependencies: &infra_prod_service_review_deps - name: infra-prod-install-ansible soft: true - - name: infra-prod-service-letsencrypt + - name: infra-prod-letsencrypt soft: true - name: system-config-promote-image-gerrit-2.13 soft: true @@ -410,7 +410,7 @@ dependencies: - name: infra-prod-install-ansible soft: true - - name: infra-prod-service-letsencrypt + - name: infra-prod-letsencrypt soft: true - name: system-config-promote-image-gitea-init soft: true @@ -467,7 +467,7 @@ dependencies: - name: infra-prod-install-ansible soft: true - - name: infra-prod-service-letsencrypt + - name: infra-prod-letsencrypt soft: true - name: system-config-promote-image-accessbot soft: true diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 4083e6a521..b1897b0f78 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -179,7 +179,7 @@ - system-config-promote-image-uwsgi-base-3.8 - infra-prod-install-ansible - infra-prod-base - - infra-prod-service-letsencrypt + - infra-prod-letsencrypt - infra-prod-manage-projects: files: - inventory/.* @@ -204,7 +204,7 @@ dependencies: - name: infra-prod-install-ansible soft: true - - name: infra-prod-service-letsencrypt + - name: infra-prod-letsencrypt soft: true - name: system-config-promote-image-etherpad soft: true @@ -245,7 +245,7 @@ # Nightly runs of ansible things for catchup - infra-prod-install-ansible - infra-prod-base - - infra-prod-service-letsencrypt + - infra-prod-letsencrypt - infra-prod-service-bridge - infra-prod-service-gitea-lb - infra-prod-service-nameserver diff --git a/zuul.d/system-config-run.yaml b/zuul.d/system-config-run.yaml index 700dcea113..67976211a7 100644 --- a/zuul.d/system-config-run.yaml +++ b/zuul.d/system-config-run.yaml @@ -189,7 +189,7 @@ vars: run_playbooks: - playbooks/service-nameserver.yaml - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml host-vars: bridge.openstack.org: host_copy_output: @@ -262,7 +262,7 @@ '/var/log/nodepool/builder-debug.log': logs vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-zookeeper.yaml - playbooks/service-nodepool.yaml - playbooks/remote_puppet_else.yaml @@ -347,7 +347,7 @@ Run the playbook for a mirror node vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-mirror.yaml host-vars: mirror01.openafs.provider.opendev.org: @@ -366,7 +366,7 @@ - playbooks/group_vars/mirror.yaml - playbooks/roles/mirror/ - playbooks/roles/letsencrypt - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-mirror.yaml - playbooks/zuul/templates/group_vars/mirror.yaml.j2 - testinfra/test_mirror.py @@ -429,7 +429,7 @@ label: ubuntu-bionic vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-registry.yaml host-vars: insecure-ci-registry01.opendev.org: @@ -462,11 +462,11 @@ label: ubuntu-bionic vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-etherpad.yaml files: - playbooks/bridge.yaml - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-etherpad.yaml - playbooks/roles/etherpad/ - playbooks/roles/install-docker/ @@ -492,7 +492,7 @@ - opendev/system-config vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-gitea-lb.yaml - playbooks/service-gitea.yaml - playbooks/manage-projects.yaml @@ -508,7 +508,7 @@ '/var/haproxy/etc': logs files: - playbooks/install-ansible.yaml - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-gitea-lb.yaml - playbooks/service-gitea.yaml - playbooks/manage-projects.yaml @@ -551,7 +551,7 @@ label: ubuntu-bionic vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-meetpad.yaml host-vars: meetpad01.opendev.org: @@ -641,7 +641,7 @@ - opendev/system-config vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-zookeeper.yaml - playbooks/service-zuul.yaml host-vars: @@ -692,7 +692,7 @@ - opendev/system-config vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-review-dev.yaml - playbooks/service-review.yaml host-vars: @@ -710,7 +710,7 @@ '/var/log/acme.sh': logs files: - playbooks/install-ansible.yaml - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-review.*.yaml - playbooks/group_vars/review.yaml - playbooks/host_vars/review\d+.openstack.org.yaml @@ -739,13 +739,13 @@ label: ubuntu-bionic vars: run_playbooks: - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-static.yaml files: - playbooks/install-ansible.yaml - playbooks/roles/static/ - playbooks/roles/letsencrypt - - playbooks/service-letsencrypt.yaml + - playbooks/letsencrypt.yaml - playbooks/service-static.yaml - testinfra/test_static.py host-vars: