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 <gabrioux@redhat.com> (cherry picked from commit e08194d)
ceph · Oct 1, 2019 · 9a79ed1 · 9a79ed1
1 parent 7f90299
commit 9a79ed1
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 6 deletions.
diff --git 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
diff --git 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/...-rgw/tasks/container/start_docker_rgw.yml → roles/ceph-rgw/tasks/start_docker_rgw.yml b/...-rgw/tasks/container/start_docker_rgw.yml → roles/ceph-rgw/tasks/start_docker_rgw.yml
diff --git a/roles/ceph-rgw/tasks/container/systemd.yml → roles/ceph-rgw/tasks/systemd.yml b/roles/ceph-rgw/tasks/container/systemd.yml → roles/ceph-rgw/tasks/systemd.yml