From: Rishabh Dave Date: Wed, 24 Apr 2019 09:19:04 +0000 (+0530) Subject: ceph-rbd-mirror: refactor tasks/main.yml X-Git-Tag: v4.0.0rc7~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=238a2696a6a8c6ebfc4668bbf9cdd6829ee2b70c;p=ceph-ansible.git ceph-rbd-mirror: refactor tasks/main.yml Use blocks for similar tasks in main.yml. And move when keywords before block keywords. Signed-off-by: Rishabh Dave (cherry picked from commit 121b5e4184a24bc5e862dd515cd2678590881c1f) --- diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml index 22480c0bb..a696baa7f 100644 --- a/roles/ceph-rbd-mirror/tasks/main.yml +++ b/roles/ceph-rbd-mirror/tasks/main.yml @@ -1,9 +1,4 @@ --- -- name: set_fact docker_exec_cmd - set_fact: - docker_exec_cmd: "{{ container_binary }} exec ceph-rbd-mirror-{{ ansible_hostname }}" - when: containerized_deployment - - name: include pre_requisite.yml include_tasks: pre_requisite.yml when: not containerized_deployment @@ -12,16 +7,22 @@ include_tasks: common.yml when: cephx -- name: include start_rbd_mirror.yml - include_tasks: start_rbd_mirror.yml +- name: tasks for non-containerized deployment when: not containerized_deployment + block: + - name: include start_rbd_mirror.yml + include_tasks: start_rbd_mirror.yml -- name: include configure_mirroring.yml - include_tasks: configure_mirroring.yml - when: - - ceph_rbd_mirror_configure - - not containerized_deployment + - name: include configure_mirroring.yml + include_tasks: configure_mirroring.yml + when: ceph_rbd_mirror_configure -- name: include docker/main.yml - include_tasks: docker/main.yml +- name: tasks for containerized deployment when: containerized_deployment + block: + - name: set_fact docker_exec_cmd + set_fact: + docker_exec_cmd: "{{ container_binary }} exec ceph-rbd-mirror-{{ ansible_hostname }}" + + - name: include docker/main.yml + include_tasks: docker/main.yml