From d7a06c67dbc98d2666c2cf1574baa7c557603872 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 30 Sep 2019 09:21:41 +0200 Subject: [PATCH] iscsigw: 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 4636f3f7e29267398495dc37db2fa511dae6596b) --- infrastructure-playbooks/docker-to-podman.yml | 2 +- roles/ceph-iscsi-gw/tasks/{container => }/containerized.yml | 0 roles/ceph-iscsi-gw/tasks/main.yml | 2 +- roles/ceph-iscsi-gw/tasks/{container => }/systemd.yml | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename roles/ceph-iscsi-gw/tasks/{container => }/containerized.yml (100%) rename roles/ceph-iscsi-gw/tasks/{container => }/systemd.yml (100%) diff --git a/infrastructure-playbooks/docker-to-podman.yml b/infrastructure-playbooks/docker-to-podman.yml index 70d890d81..f8f83cdf0 100644 --- a/infrastructure-playbooks/docker-to-podman.yml +++ b/infrastructure-playbooks/docker-to-podman.yml @@ -75,7 +75,7 @@ - import_role: name: ceph-iscsi-gw - tasks_from: container/systemd.yml + tasks_from: systemd.yml when: inventory_hostname in groups.get(iscsi_gw_group_name, []) - import_role: diff --git a/roles/ceph-iscsi-gw/tasks/container/containerized.yml b/roles/ceph-iscsi-gw/tasks/containerized.yml similarity index 100% rename from roles/ceph-iscsi-gw/tasks/container/containerized.yml rename to roles/ceph-iscsi-gw/tasks/containerized.yml diff --git a/roles/ceph-iscsi-gw/tasks/main.yml b/roles/ceph-iscsi-gw/tasks/main.yml index 3d8bee854..05732a0da 100644 --- a/roles/ceph-iscsi-gw/tasks/main.yml +++ b/roles/ceph-iscsi-gw/tasks/main.yml @@ -20,5 +20,5 @@ - not use_new_ceph_iscsi | bool - name: include containerized.yml - include_tasks: container/containerized.yml + include_tasks: containerized.yml when: containerized_deployment | bool diff --git a/roles/ceph-iscsi-gw/tasks/container/systemd.yml b/roles/ceph-iscsi-gw/tasks/systemd.yml similarity index 100% rename from roles/ceph-iscsi-gw/tasks/container/systemd.yml rename to roles/ceph-iscsi-gw/tasks/systemd.yml