From fdcf471e7cdb5d9a1292f5fc30ada89faa4597a1 Mon Sep 17 00:00:00 2001 From: Matej Focko Date: Mon, 16 Dec 2024 13:36:40 +0100 Subject: [PATCH] fix(roles): move roles out to the top-level Signed-off-by: Matej Focko --- .ansible-lint-ignore | 2 +- ansible.cfg | 2 ++ {playbooks/roles => roles}/deploy/defaults/main.yml | 0 {playbooks/roles => roles}/deploy/handlers/main.yml | 0 {playbooks/roles => roles}/deploy/tasks/main.yml | 0 .../roles => roles}/generate_secrets/files/centpkg-sig.conf.j2 | 0 {playbooks/roles => roles}/generate_secrets/files/copr | 0 .../roles => roles}/generate_secrets/files/extra-vars.yml | 0 .../roles => roles}/generate_secrets/files/fedora.toml.j2 | 0 .../generate_secrets/files/packit-service.yaml.j2 | 0 {playbooks/roles => roles}/generate_secrets/files/ssh_config | 0 .../generate_secrets/tasks/create-directories.yml | 0 .../roles => roles}/generate_secrets/tasks/generate-cert.yml | 0 .../roles => roles}/generate_secrets/tasks/generate-configs.yml | 0 .../roles => roles}/generate_secrets/tasks/generate-ssh.yml | 0 {playbooks/roles => roles}/generate_secrets/tasks/main.yml | 0 .../roles => roles}/generate_secrets/tasks/project-dir.yml | 0 .../roles => roles}/generate_secrets/tasks/touch-files.yml | 0 {playbooks/roles => roles}/generate_secrets/vars/main.yml | 0 {playbooks/tasks => tasks}/check-pod-running.yml | 0 {playbooks/tasks => tasks}/check-up-to-date.yml | 0 {playbooks/tasks => tasks}/k8s.yml | 0 {playbooks/tasks => tasks}/project-dir.yml | 0 {playbooks/tasks => tasks}/set-deployment-facts.yml | 0 {playbooks/tasks => tasks}/set-facts.yml | 0 {playbooks/tasks => tasks}/wait_for_pod.yml | 0 26 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 ansible.cfg rename {playbooks/roles => roles}/deploy/defaults/main.yml (100%) rename {playbooks/roles => roles}/deploy/handlers/main.yml (100%) rename {playbooks/roles => roles}/deploy/tasks/main.yml (100%) rename {playbooks/roles => roles}/generate_secrets/files/centpkg-sig.conf.j2 (100%) rename {playbooks/roles => roles}/generate_secrets/files/copr (100%) rename {playbooks/roles => roles}/generate_secrets/files/extra-vars.yml (100%) rename {playbooks/roles => roles}/generate_secrets/files/fedora.toml.j2 (100%) rename {playbooks/roles => roles}/generate_secrets/files/packit-service.yaml.j2 (100%) rename {playbooks/roles => roles}/generate_secrets/files/ssh_config (100%) rename {playbooks/roles => roles}/generate_secrets/tasks/create-directories.yml (100%) rename {playbooks/roles => roles}/generate_secrets/tasks/generate-cert.yml (100%) rename {playbooks/roles => roles}/generate_secrets/tasks/generate-configs.yml (100%) rename {playbooks/roles => roles}/generate_secrets/tasks/generate-ssh.yml (100%) rename {playbooks/roles => roles}/generate_secrets/tasks/main.yml (100%) rename {playbooks/roles => roles}/generate_secrets/tasks/project-dir.yml (100%) rename {playbooks/roles => roles}/generate_secrets/tasks/touch-files.yml (100%) rename {playbooks/roles => roles}/generate_secrets/vars/main.yml (100%) rename {playbooks/tasks => tasks}/check-pod-running.yml (100%) rename {playbooks/tasks => tasks}/check-up-to-date.yml (100%) rename {playbooks/tasks => tasks}/k8s.yml (100%) rename {playbooks/tasks => tasks}/project-dir.yml (100%) rename {playbooks/tasks => tasks}/set-deployment-facts.yml (100%) rename {playbooks/tasks => tasks}/set-facts.yml (100%) rename {playbooks/tasks => tasks}/wait_for_pod.yml (100%) diff --git a/.ansible-lint-ignore b/.ansible-lint-ignore index ade00b6..bab90a4 100644 --- a/.ansible-lint-ignore +++ b/.ansible-lint-ignore @@ -1 +1 @@ -playbooks/roles/deploy/defaults/main.yml var-naming[no-role-prefix] +roles/deploy/defaults/main.yml var-naming[no-role-prefix] diff --git a/ansible.cfg b/ansible.cfg new file mode 100644 index 0000000..643c8de --- /dev/null +++ b/ansible.cfg @@ -0,0 +1,2 @@ +[defaults] +roles_path = roles/ diff --git a/playbooks/roles/deploy/defaults/main.yml b/roles/deploy/defaults/main.yml similarity index 100% rename from playbooks/roles/deploy/defaults/main.yml rename to roles/deploy/defaults/main.yml diff --git a/playbooks/roles/deploy/handlers/main.yml b/roles/deploy/handlers/main.yml similarity index 100% rename from playbooks/roles/deploy/handlers/main.yml rename to roles/deploy/handlers/main.yml diff --git a/playbooks/roles/deploy/tasks/main.yml b/roles/deploy/tasks/main.yml similarity index 100% rename from playbooks/roles/deploy/tasks/main.yml rename to roles/deploy/tasks/main.yml diff --git a/playbooks/roles/generate_secrets/files/centpkg-sig.conf.j2 b/roles/generate_secrets/files/centpkg-sig.conf.j2 similarity index 100% rename from playbooks/roles/generate_secrets/files/centpkg-sig.conf.j2 rename to roles/generate_secrets/files/centpkg-sig.conf.j2 diff --git a/playbooks/roles/generate_secrets/files/copr b/roles/generate_secrets/files/copr similarity index 100% rename from playbooks/roles/generate_secrets/files/copr rename to roles/generate_secrets/files/copr diff --git a/playbooks/roles/generate_secrets/files/extra-vars.yml b/roles/generate_secrets/files/extra-vars.yml similarity index 100% rename from playbooks/roles/generate_secrets/files/extra-vars.yml rename to roles/generate_secrets/files/extra-vars.yml diff --git a/playbooks/roles/generate_secrets/files/fedora.toml.j2 b/roles/generate_secrets/files/fedora.toml.j2 similarity index 100% rename from playbooks/roles/generate_secrets/files/fedora.toml.j2 rename to roles/generate_secrets/files/fedora.toml.j2 diff --git a/playbooks/roles/generate_secrets/files/packit-service.yaml.j2 b/roles/generate_secrets/files/packit-service.yaml.j2 similarity index 100% rename from playbooks/roles/generate_secrets/files/packit-service.yaml.j2 rename to roles/generate_secrets/files/packit-service.yaml.j2 diff --git a/playbooks/roles/generate_secrets/files/ssh_config b/roles/generate_secrets/files/ssh_config similarity index 100% rename from playbooks/roles/generate_secrets/files/ssh_config rename to roles/generate_secrets/files/ssh_config diff --git a/playbooks/roles/generate_secrets/tasks/create-directories.yml b/roles/generate_secrets/tasks/create-directories.yml similarity index 100% rename from playbooks/roles/generate_secrets/tasks/create-directories.yml rename to roles/generate_secrets/tasks/create-directories.yml diff --git a/playbooks/roles/generate_secrets/tasks/generate-cert.yml b/roles/generate_secrets/tasks/generate-cert.yml similarity index 100% rename from playbooks/roles/generate_secrets/tasks/generate-cert.yml rename to roles/generate_secrets/tasks/generate-cert.yml diff --git a/playbooks/roles/generate_secrets/tasks/generate-configs.yml b/roles/generate_secrets/tasks/generate-configs.yml similarity index 100% rename from playbooks/roles/generate_secrets/tasks/generate-configs.yml rename to roles/generate_secrets/tasks/generate-configs.yml diff --git a/playbooks/roles/generate_secrets/tasks/generate-ssh.yml b/roles/generate_secrets/tasks/generate-ssh.yml similarity index 100% rename from playbooks/roles/generate_secrets/tasks/generate-ssh.yml rename to roles/generate_secrets/tasks/generate-ssh.yml diff --git a/playbooks/roles/generate_secrets/tasks/main.yml b/roles/generate_secrets/tasks/main.yml similarity index 100% rename from playbooks/roles/generate_secrets/tasks/main.yml rename to roles/generate_secrets/tasks/main.yml diff --git a/playbooks/roles/generate_secrets/tasks/project-dir.yml b/roles/generate_secrets/tasks/project-dir.yml similarity index 100% rename from playbooks/roles/generate_secrets/tasks/project-dir.yml rename to roles/generate_secrets/tasks/project-dir.yml diff --git a/playbooks/roles/generate_secrets/tasks/touch-files.yml b/roles/generate_secrets/tasks/touch-files.yml similarity index 100% rename from playbooks/roles/generate_secrets/tasks/touch-files.yml rename to roles/generate_secrets/tasks/touch-files.yml diff --git a/playbooks/roles/generate_secrets/vars/main.yml b/roles/generate_secrets/vars/main.yml similarity index 100% rename from playbooks/roles/generate_secrets/vars/main.yml rename to roles/generate_secrets/vars/main.yml diff --git a/playbooks/tasks/check-pod-running.yml b/tasks/check-pod-running.yml similarity index 100% rename from playbooks/tasks/check-pod-running.yml rename to tasks/check-pod-running.yml diff --git a/playbooks/tasks/check-up-to-date.yml b/tasks/check-up-to-date.yml similarity index 100% rename from playbooks/tasks/check-up-to-date.yml rename to tasks/check-up-to-date.yml diff --git a/playbooks/tasks/k8s.yml b/tasks/k8s.yml similarity index 100% rename from playbooks/tasks/k8s.yml rename to tasks/k8s.yml diff --git a/playbooks/tasks/project-dir.yml b/tasks/project-dir.yml similarity index 100% rename from playbooks/tasks/project-dir.yml rename to tasks/project-dir.yml diff --git a/playbooks/tasks/set-deployment-facts.yml b/tasks/set-deployment-facts.yml similarity index 100% rename from playbooks/tasks/set-deployment-facts.yml rename to tasks/set-deployment-facts.yml diff --git a/playbooks/tasks/set-facts.yml b/tasks/set-facts.yml similarity index 100% rename from playbooks/tasks/set-facts.yml rename to tasks/set-facts.yml diff --git a/playbooks/tasks/wait_for_pod.yml b/tasks/wait_for_pod.yml similarity index 100% rename from playbooks/tasks/wait_for_pod.yml rename to tasks/wait_for_pod.yml