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 <ridave@redhat.com>
pull/3960/head
Rishabh Dave 2019-04-24 14:49:04 +05:30 committed by Guillaume Abrioux
parent 1a4dccdbb9
commit 121b5e4184
1 changed files with 15 additions and 14 deletions

View File

@ -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 - name: include pre_requisite.yml
include_tasks: pre_requisite.yml include_tasks: pre_requisite.yml
when: not containerized_deployment when: not containerized_deployment
@ -12,16 +7,22 @@
include_tasks: common.yml include_tasks: common.yml
when: cephx when: cephx
- name: tasks for non-containerized deployment
when: not containerized_deployment
block:
- name: include start_rbd_mirror.yml - name: include start_rbd_mirror.yml
include_tasks: start_rbd_mirror.yml include_tasks: start_rbd_mirror.yml
when: not containerized_deployment
- name: include configure_mirroring.yml - name: include configure_mirroring.yml
include_tasks: configure_mirroring.yml include_tasks: configure_mirroring.yml
when: when: ceph_rbd_mirror_configure
- ceph_rbd_mirror_configure
- not containerized_deployment - 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 - name: include docker/main.yml
include_tasks: docker/main.yml include_tasks: docker/main.yml
when: containerized_deployment