From 19950b5170950d8eae7360ebf54adaad978e9024 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 24 Jul 2019 10:44:34 +0200 Subject: [PATCH] container: rename docker directories Those 2 directories should be renamed to be more generic (docker vs. podman). Signed-off-by: Guillaume Abrioux --- roles/ceph-rbd-mirror/tasks/{docker => container}/main.yml | 0 .../tasks/{docker => container}/start_docker_rbd_mirror.yml | 0 roles/ceph-rbd-mirror/tasks/main.yml | 4 ++-- roles/ceph-rgw/tasks/{docker => container}/main.yml | 0 .../ceph-rgw/tasks/{docker => container}/start_docker_rgw.yml | 0 roles/ceph-rgw/tasks/main.yml | 4 ++-- 6 files changed, 4 insertions(+), 4 deletions(-) rename roles/ceph-rbd-mirror/tasks/{docker => container}/main.yml (100%) rename roles/ceph-rbd-mirror/tasks/{docker => container}/start_docker_rbd_mirror.yml (100%) rename roles/ceph-rgw/tasks/{docker => container}/main.yml (100%) rename roles/ceph-rgw/tasks/{docker => container}/start_docker_rgw.yml (100%) diff --git a/roles/ceph-rbd-mirror/tasks/docker/main.yml b/roles/ceph-rbd-mirror/tasks/container/main.yml similarity index 100% rename from roles/ceph-rbd-mirror/tasks/docker/main.yml rename to roles/ceph-rbd-mirror/tasks/container/main.yml diff --git a/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/container/start_docker_rbd_mirror.yml similarity index 100% rename from roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml rename to roles/ceph-rbd-mirror/tasks/container/start_docker_rbd_mirror.yml diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml index c29810069..e52cd68a7 100644 --- a/roles/ceph-rbd-mirror/tasks/main.yml +++ b/roles/ceph-rbd-mirror/tasks/main.yml @@ -24,5 +24,5 @@ set_fact: container_exec_cmd: "{{ container_binary }} exec ceph-rbd-mirror-{{ ansible_hostname }}" - - name: include docker/main.yml - include_tasks: docker/main.yml + - name: include container/main.yml + include_tasks: container/main.yml diff --git a/roles/ceph-rgw/tasks/docker/main.yml b/roles/ceph-rgw/tasks/container/main.yml similarity index 100% rename from roles/ceph-rgw/tasks/docker/main.yml rename to roles/ceph-rgw/tasks/container/main.yml diff --git a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml b/roles/ceph-rgw/tasks/container/start_docker_rgw.yml similarity index 100% rename from roles/ceph-rgw/tasks/docker/start_docker_rgw.yml rename to roles/ceph-rgw/tasks/container/start_docker_rgw.yml diff --git a/roles/ceph-rgw/tasks/main.yml b/roles/ceph-rgw/tasks/main.yml index 84ca62ff4..df0e8bc3e 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 docker/main.yml - include_tasks: docker/main.yml +- name: include_tasks container/main.yml + include_tasks: container/main.yml when: containerized_deployment | bool - name: include_tasks multisite/main.yml