rbdmirror: 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>
ceph · Oct 1, 2019 · c69816c · c69816c
1 parent 4636f3f
commit c69816c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml
@@ -100,10 +100,10 @@
 
     - import_role:
         name: ceph-rbd-mirror
-        tasks_from: container/systemd.yml
+        tasks_from: systemd.yml
       when: inventory_hostname in groups.get(rbdmirror_group_name, [])
 
     - import_role:
         name: ceph-rgw
         tasks_from: container/systemd.yml
-      when: inventory_hostname in groups.get(rgw_group_name, [])
+      when: inventory_hostname in groups.get(rgw_group_name, [])
diff --git a/roles/ceph-rbd-mirror/tasks/container/main.yml b/roles/ceph-rbd-mirror/tasks/container/main.yml
diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml
@@ -18,8 +18,8 @@
       set_fact:
         container_exec_cmd: "{{ container_binary }} exec ceph-rbd-mirror-{{ ansible_hostname }}"
 
-    - name: include container/main.yml
-      include_tasks: container/main.yml
+    - name: include start_docker_rbd_mirror.yml
+      include_tasks: start_docker_rbd_mirror.yml
 
 - name: include configure_mirroring.yml
   include_tasks: configure_mirroring.yml

diff --git a/...sks/container/start_docker_rbd_mirror.yml → ...-mirror/tasks/start_docker_rbd_mirror.yml b/...sks/container/start_docker_rbd_mirror.yml → ...-mirror/tasks/start_docker_rbd_mirror.yml
diff --git a/...ph-rbd-mirror/tasks/container/systemd.yml → roles/ceph-rbd-mirror/tasks/systemd.yml b/...ph-rbd-mirror/tasks/container/systemd.yml → roles/ceph-rbd-mirror/tasks/systemd.yml