From 2e6cf25e5d56153e73e6fb60d68d51f3f4cc3a80 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 1 Apr 2020 14:12:57 -0500 Subject: [PATCH] Rename bridge.yaml to install-ansible.yaml We have a bridge.yaml and a service-bridge.yaml and it keeps being confusing. Rename bridge.yaml to install-ansible.yaml to make it clear what it is that it actually does. Add a soft-depend on it for manage-projects, because if something updates with the ansible config, we want it to happen before running manage-projects. Change-Id: Ia7c8dd0e32b2c4aaa674061037be5ab66d9a3581 --- .zuul.yaml | 44 ++++++++++--------- .../{bridge.yaml => install-ansible.yaml} | 0 playbooks/zuul/run-base.yaml | 2 +- 3 files changed, 24 insertions(+), 22 deletions(-) rename playbooks/{bridge.yaml => install-ansible.yaml} (100%) diff --git a/.zuul.yaml b/.zuul.yaml index aa3411d4c9..7625e3fd23 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -968,7 +968,7 @@ - name: eavesdrop01.openstack.org label: ubuntu-xenial files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/group_vars/eavesdrop.yaml - testinfra/test_eavesdrop.py vars: @@ -1002,7 +1002,7 @@ host_copy_output: '/var/log/acme.sh': logs files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/group_vars/letsencrypt.yaml - playbooks/roles/letsencrypt.* @@ -1018,7 +1018,7 @@ - name: lists.openstack.org label: ubuntu-xenial files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - modules/openstack_project/manifests/lists.pp - playbooks/host_vars/lists.openstack.org.yaml - roles/exim @@ -1047,7 +1047,7 @@ - playbooks/service-nodepool.yaml - playbooks/remote_puppet_else.yaml files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/group_vars/nodepool.yaml - playbooks/group_vars/nodepool-builder.yaml - playbooks/group_vars/nodepool-launcher.yaml @@ -1081,7 +1081,7 @@ '/etc/bind/named.conf': logs '/var/lib/bind/zones': logs files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/group_vars/adns.yaml - playbooks/group_vars/dns.yaml - ^playbooks/host_vars/(ad)?ns\d+.opendev.org.yaml @@ -1111,7 +1111,7 @@ run_playbooks: - playbooks/service-backup.yaml files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/roles/backup.* - playbooks/zuul/templates/host_vars/backup.* - testinfra/test_backups.py @@ -1132,7 +1132,7 @@ '/var/log/apache2/': logs '/var/log/acme.sh': logs files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - roles/ - playbooks/group_vars/mirror_opendev.yaml - playbooks/roles/mirror/ @@ -1178,7 +1178,7 @@ run_playbooks: - playbooks/service-mirror-update.yaml files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - roles/ - playbooks/roles/mirror-update/ - playbooks/service-mirror-update.yaml @@ -1205,7 +1205,7 @@ '/var/registry/auth': logs '/var/registry/certs': logs files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/group_vars/registry.yaml - ^playbooks/host_vars/insecure-ci-registry\d+.opendev.org.yaml - playbooks/zuul/templates/group_vars/registry.yaml.j2 @@ -1244,7 +1244,7 @@ host_copy_output: '/var/haproxy/etc': logs files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/service-letsencrypt.yaml - playbooks/service-gitea-lb.yaml - playbooks/service-gitea.yaml @@ -1292,7 +1292,7 @@ host_copy_output: '/var/jitsi-meet': logs files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/group_vars/meetpad.yaml - ^playbooks/host_vars/meetpad\d+.opendev.org.yaml - playbooks/roles/letsencrypt-create-certs/handlers/restart_jitsi_meet.yaml @@ -1314,7 +1314,7 @@ run_playbooks: - playbooks/service-zuul.yaml files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/roles/zuul-preview/ - testinfra/test_zuul_preview.py @@ -1351,7 +1351,7 @@ '/var/log/apache2/': logs '/var/log/acme.sh': logs files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/service-letsencrypt.yaml - ^playbooks/service-review.*.yaml - playbooks/group_vars/review.yaml @@ -1382,7 +1382,7 @@ - playbooks/service-letsencrypt.yaml - playbooks/service-static.yaml files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/roles/static/ - playbooks/roles/letsencrypt.* - playbooks/service-letsencrypt.yaml @@ -1449,15 +1449,15 @@ playbook_name: update-system-config.yaml - job: - name: infra-prod-bridge + name: infra-prod-install-ansible parent: infra-prod-playbook - description: Update the code on bridge + description: Install ansible on bridge dependencies: - infra-prod-update-system-config vars: - playbook_name: bridge.yaml + playbook_name: install-ansible.yaml files: - - playbooks/bridge.yaml + - playbooks/install-ansible.yaml - playbooks/roles/pip3/.* - playbooks/roles/install-ansible/.* - playbooks/roles/root-keys/.* @@ -1470,7 +1470,7 @@ description: Run the base playbook everywhere dependencies: - infra-prod-update-system-config - - name: infra-prod-bridge + - name: infra-prod-install-ansible soft: true vars: playbook_name: base.yaml @@ -1806,7 +1806,7 @@ - system-config-promote-image-python-builder-3.8 - infra-prod-update-system-config - infra-prod-base - - infra-prod-bridge + - infra-prod-install-ansible - infra-prod-manage-projects: files: - playbooks/manage-projects.yaml @@ -1821,6 +1821,8 @@ - name: system-config-promote-image-gerrit-2.13 soft: true - name: infra-prod-update-system-config + - name: infra-prod-install-ansible + soft: true periodic: jobs: - developer-openstack-goaccess-report @@ -1836,4 +1838,4 @@ # Nightly runs of ansible things for catchup - infra-prod-update-system-config - infra-prod-base - - infra-prod-bridge + - infra-prod-install-ansible diff --git a/playbooks/bridge.yaml b/playbooks/install-ansible.yaml similarity index 100% rename from playbooks/bridge.yaml rename to playbooks/install-ansible.yaml diff --git a/playbooks/zuul/run-base.yaml b/playbooks/zuul/run-base.yaml index ff335289c1..0641842c35 100644 --- a/playbooks/zuul/run-base.yaml +++ b/playbooks/zuul/run-base.yaml @@ -1,4 +1,4 @@ -- import_playbook: ../bridge.yaml +- import_playbook: ../install-ansible.yaml vars: root_rsa_key: "{{ lookup('file', zuul.executor.work_root + '/' + zuul.build + '_id_rsa') }}" ansible_cron_disable_job: true