From 9a79ed1bf02c69f5cfc23bb90f479fe90da587a4 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 30 Sep 2019 09:40:56 +0200 Subject: [PATCH] rgw: refact tasks directory layout This commit moves containerized deployment related files to `./tasks/` directory. This is needed to make `docker-to-podman.yml` working since we use `tasks_from:` option. Signed-off-by: Guillaume Abrioux (cherry picked from commit e08194dd677bd3312240d46765e40b3f4aa6fe33) --- infrastructure-playbooks/docker-to-podman.yml | 2 +- roles/ceph-rgw/tasks/container/main.yml | 3 --- roles/ceph-rgw/tasks/main.yml | 4 ++-- roles/ceph-rgw/tasks/{container => }/start_docker_rgw.yml | 0 roles/ceph-rgw/tasks/{container => }/systemd.yml | 0 5 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 roles/ceph-rgw/tasks/container/main.yml rename roles/ceph-rgw/tasks/{container => }/start_docker_rgw.yml (100%) rename roles/ceph-rgw/tasks/{container => }/systemd.yml (100%) diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml index 7908bb960..861d95704 100644 --- a/infrastructure-playbooks/docker-to-podman.yml +++ b/infrastructure-playbooks/docker-to-podman.yml @@ -105,5 +105,5 @@ - import_role: name: ceph-rgw - tasks_from: container/systemd.yml + tasks_from: systemd.yml when: inventory_hostname in groups.get(rgw_group_name, []) diff --git a/roles/ceph-rgw/tasks/container/main.yml b/roles/ceph-rgw/tasks/container/main.yml deleted file mode 100644 index 539c42303..000000000 --- a/roles/ceph-rgw/tasks/container/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: include start_docker_rgw.yml - include_tasks: start_docker_rgw.yml diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml index df0e8bc3e..dad3c5504 100644 --- a/roles/ceph-rgw/tasks/main.yml +++ b/roles/ceph-rgw/tasks/main.yml @@ -14,8 +14,8 @@ include_tasks: start_radosgw.yml when: not containerized_deployment | bool -- name: include_tasks container/main.yml - include_tasks: container/main.yml +- name: include start_docker_rgw.yml + include_tasks: start_docker_rgw.yml when: containerized_deployment | bool - name: include_tasks multisite/main.yml diff --git a/roles/ceph-rgw/tasks/container/start_docker_rgw.yml b/roles/ceph-rgw/tasks/start_docker_rgw.yml similarity index 100% rename from roles/ceph-rgw/tasks/container/start_docker_rgw.yml rename to roles/ceph-rgw/tasks/start_docker_rgw.yml diff --git a/roles/ceph-rgw/tasks/container/systemd.yml b/roles/ceph-rgw/tasks/systemd.yml similarity index 100% rename from roles/ceph-rgw/tasks/container/systemd.yml rename to roles/ceph-rgw/tasks/systemd.yml -- 2.39.5