From 45d448ae5b806d0cd044eff5c0480c0b00a2824f Mon Sep 17 00:00:00 2001 From: Ernestas Kulik Date: Wed, 12 Feb 2020 14:31:19 +0100 Subject: [PATCH] Rename local retrace roles MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The “local” bit is quite redundant and they are otherwise confusingly named. --- playbooks/groups/retrace.yml | 8 ++++---- roles/abrt/{faf-local-post => faf-post}/defaults/main.yml | 0 roles/abrt/{faf-local-post => faf-post}/handlers/main.yml | 0 roles/abrt/{faf-local-post => faf-post}/tasks/cron.yml | 0 roles/abrt/{faf-local-post => faf-post}/tasks/main.yml | 0 roles/abrt/{faf-local => faf-pre}/defaults/main.yml | 0 .../files/group_abrt-faf-el7-epel-7.repo | 0 roles/abrt/{faf-local => faf-pre}/handlers/main.yml | 0 roles/abrt/{faf-local => faf-pre}/tasks/install.yml | 0 roles/abrt/{faf-local => faf-pre}/tasks/main.yml | 0 roles/abrt/{faf-local => faf-pre}/tasks/services.yml | 0 roles/abrt/{faf-local => faf-pre}/tasks/setup_db.yml | 0 .../{retrace-local => retrace-post}/defaults/main.yml | 0 .../{retrace-local => retrace-post}/handlers/main.yml | 0 roles/abrt/{retrace-local => retrace-post}/tasks/cron.yml | 0 roles/abrt/{retrace-local => retrace-post}/tasks/main.yml | 0 .../tasks/retrace_setup.yml | 0 .../{retrace-local-pre => retrace-pre}/tasks/main.yml | 0 18 files changed, 4 insertions(+), 4 deletions(-) rename roles/abrt/{faf-local-post => faf-post}/defaults/main.yml (100%) rename roles/abrt/{faf-local-post => faf-post}/handlers/main.yml (100%) rename roles/abrt/{faf-local-post => faf-post}/tasks/cron.yml (100%) rename roles/abrt/{faf-local-post => faf-post}/tasks/main.yml (100%) rename roles/abrt/{faf-local => faf-pre}/defaults/main.yml (100%) rename roles/abrt/{faf-local => faf-pre}/files/group_abrt-faf-el7-epel-7.repo (100%) rename roles/abrt/{faf-local => faf-pre}/handlers/main.yml (100%) rename roles/abrt/{faf-local => faf-pre}/tasks/install.yml (100%) rename roles/abrt/{faf-local => faf-pre}/tasks/main.yml (100%) rename roles/abrt/{faf-local => faf-pre}/tasks/services.yml (100%) rename roles/abrt/{faf-local => faf-pre}/tasks/setup_db.yml (100%) rename roles/abrt/{retrace-local => retrace-post}/defaults/main.yml (100%) rename roles/abrt/{retrace-local => retrace-post}/handlers/main.yml (100%) rename roles/abrt/{retrace-local => retrace-post}/tasks/cron.yml (100%) rename roles/abrt/{retrace-local => retrace-post}/tasks/main.yml (100%) rename roles/abrt/{retrace-local => retrace-post}/tasks/retrace_setup.yml (100%) rename roles/abrt/{retrace-local-pre => retrace-pre}/tasks/main.yml (100%) diff --git a/playbooks/groups/retrace.yml b/playbooks/groups/retrace.yml index bea296c3aa..6b5359ceed 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -71,9 +71,9 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - #- abrt/faf-local + #- abrt/faf-pre #- { role: abrt/faf, faf_web_on_root: false, faf_admin_mail: msuchy@redhat.com, faf_web_openid_privileged_teams: "provenpackager,proventesters", faf_web_secret_key: "{{fedora_faf_web_secret_key}}", faf_spool_dir: /srv/faf/ } - - abrt/faf-local-post + - abrt/faf-post - name: setup retrace server hosts: retrace @@ -85,6 +85,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml roles: - - abrt/retrace-local-pre + - abrt/retrace-pre #- { role: abrt/retrace, rs_require_gpg_check: false, rs_max_parallel_tasks: 12, rs_max_packed_size: 1024, rs_max_unpacked_size: 1280, rs_min_storage_left: 1280, rs_delete_task_after: 8, rs_delete_failed_task_after: 1, rs_repo_dir: /srv/retrace/repos, rs_save_dir: /srv/retrace/tasks, rs_faf_link_dir: /srv/retrace/hardlink-local, hostname: retrace.fedoraproject.org, faf_spool_dir: /srv/faf } - - abrt/retrace-local + - abrt/retrace-post diff --git a/roles/abrt/faf-local-post/defaults/main.yml b/roles/abrt/faf-post/defaults/main.yml similarity index 100% rename from roles/abrt/faf-local-post/defaults/main.yml rename to roles/abrt/faf-post/defaults/main.yml diff --git a/roles/abrt/faf-local-post/handlers/main.yml b/roles/abrt/faf-post/handlers/main.yml similarity index 100% rename from roles/abrt/faf-local-post/handlers/main.yml rename to roles/abrt/faf-post/handlers/main.yml diff --git a/roles/abrt/faf-local-post/tasks/cron.yml b/roles/abrt/faf-post/tasks/cron.yml similarity index 100% rename from roles/abrt/faf-local-post/tasks/cron.yml rename to roles/abrt/faf-post/tasks/cron.yml diff --git a/roles/abrt/faf-local-post/tasks/main.yml b/roles/abrt/faf-post/tasks/main.yml similarity index 100% rename from roles/abrt/faf-local-post/tasks/main.yml rename to roles/abrt/faf-post/tasks/main.yml diff --git a/roles/abrt/faf-local/defaults/main.yml b/roles/abrt/faf-pre/defaults/main.yml similarity index 100% rename from roles/abrt/faf-local/defaults/main.yml rename to roles/abrt/faf-pre/defaults/main.yml diff --git a/roles/abrt/faf-local/files/group_abrt-faf-el7-epel-7.repo b/roles/abrt/faf-pre/files/group_abrt-faf-el7-epel-7.repo similarity index 100% rename from roles/abrt/faf-local/files/group_abrt-faf-el7-epel-7.repo rename to roles/abrt/faf-pre/files/group_abrt-faf-el7-epel-7.repo diff --git a/roles/abrt/faf-local/handlers/main.yml b/roles/abrt/faf-pre/handlers/main.yml similarity index 100% rename from roles/abrt/faf-local/handlers/main.yml rename to roles/abrt/faf-pre/handlers/main.yml diff --git a/roles/abrt/faf-local/tasks/install.yml b/roles/abrt/faf-pre/tasks/install.yml similarity index 100% rename from roles/abrt/faf-local/tasks/install.yml rename to roles/abrt/faf-pre/tasks/install.yml diff --git a/roles/abrt/faf-local/tasks/main.yml b/roles/abrt/faf-pre/tasks/main.yml similarity index 100% rename from roles/abrt/faf-local/tasks/main.yml rename to roles/abrt/faf-pre/tasks/main.yml diff --git a/roles/abrt/faf-local/tasks/services.yml b/roles/abrt/faf-pre/tasks/services.yml similarity index 100% rename from roles/abrt/faf-local/tasks/services.yml rename to roles/abrt/faf-pre/tasks/services.yml diff --git a/roles/abrt/faf-local/tasks/setup_db.yml b/roles/abrt/faf-pre/tasks/setup_db.yml similarity index 100% rename from roles/abrt/faf-local/tasks/setup_db.yml rename to roles/abrt/faf-pre/tasks/setup_db.yml diff --git a/roles/abrt/retrace-local/defaults/main.yml b/roles/abrt/retrace-post/defaults/main.yml similarity index 100% rename from roles/abrt/retrace-local/defaults/main.yml rename to roles/abrt/retrace-post/defaults/main.yml diff --git a/roles/abrt/retrace-local/handlers/main.yml b/roles/abrt/retrace-post/handlers/main.yml similarity index 100% rename from roles/abrt/retrace-local/handlers/main.yml rename to roles/abrt/retrace-post/handlers/main.yml diff --git a/roles/abrt/retrace-local/tasks/cron.yml b/roles/abrt/retrace-post/tasks/cron.yml similarity index 100% rename from roles/abrt/retrace-local/tasks/cron.yml rename to roles/abrt/retrace-post/tasks/cron.yml diff --git a/roles/abrt/retrace-local/tasks/main.yml b/roles/abrt/retrace-post/tasks/main.yml similarity index 100% rename from roles/abrt/retrace-local/tasks/main.yml rename to roles/abrt/retrace-post/tasks/main.yml diff --git a/roles/abrt/retrace-local/tasks/retrace_setup.yml b/roles/abrt/retrace-post/tasks/retrace_setup.yml similarity index 100% rename from roles/abrt/retrace-local/tasks/retrace_setup.yml rename to roles/abrt/retrace-post/tasks/retrace_setup.yml diff --git a/roles/abrt/retrace-local-pre/tasks/main.yml b/roles/abrt/retrace-pre/tasks/main.yml similarity index 100% rename from roles/abrt/retrace-local-pre/tasks/main.yml rename to roles/abrt/retrace-pre/tasks/main.yml