From 7f902994b320d46f57c088b822217b7e77792c92 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 30 Sep 2019 09:36:00 +0200 Subject: [PATCH] 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 (cherry picked from commit c69816c6b755295e33a9b96d64627de1683b0a46) --- infrastructure-playbooks/docker-to-podman.yml | 4 ++-- roles/ceph-rbd-mirror/tasks/container/main.yml | 3 --- roles/ceph-rbd-mirror/tasks/main.yml | 4 ++-- .../tasks/{container => }/start_docker_rbd_mirror.yml | 0 roles/ceph-rbd-mirror/tasks/{container => }/systemd.yml | 0 5 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 roles/ceph-rbd-mirror/tasks/container/main.yml rename roles/ceph-rbd-mirror/tasks/{container => }/start_docker_rbd_mirror.yml (100%) rename roles/ceph-rbd-mirror/tasks/{container => }/systemd.yml (100%) diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml index f8f83cdf0..7908bb960 100644 --- 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, []) \ No newline at end of file + 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 deleted file mode 100644 index 8c2e8a866..000000000 --- a/roles/ceph-rbd-mirror/tasks/container/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -- name: include start_docker_rbd_mirror.yml - include_tasks: start_docker_rbd_mirror.yml diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml index c7764cd8d..6388567c2 100644 --- 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/roles/ceph-rbd-mirror/tasks/container/start_docker_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/start_docker_rbd_mirror.yml similarity index 100% rename from roles/ceph-rbd-mirror/tasks/container/start_docker_rbd_mirror.yml rename to roles/ceph-rbd-mirror/tasks/start_docker_rbd_mirror.yml diff --git a/roles/ceph-rbd-mirror/tasks/container/systemd.yml b/roles/ceph-rbd-mirror/tasks/systemd.yml similarity index 100% rename from roles/ceph-rbd-mirror/tasks/container/systemd.yml rename to roles/ceph-rbd-mirror/tasks/systemd.yml -- 2.39.5