ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge task blocks if their execution is based on same conditions 

Signed-off-by: Rishabh Dave <ridave@redhat.com>
pull/3764/head
Rishabh Dave 2019-03-28 14:17:26 +05:30 committed by mergify[bot]
parent e0beaf123a
commit 4241b6403f
2 changed files with 52 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-container-common/tasks/pre_requisites/prerequisites.yml
View File

@ -54,9 +54,12 @@
tags: tags:
with_pkg with_pkg
- name: red hat 7 based systems tasks - name: red hat based systems tasks
when: when:
- ansible_os_family == 'RedHat' - ansible_os_family == 'RedHat'
block:
- name: red hat 7 based systems tasks
when:
- ansible_distribution_major_version == '7' - ansible_distribution_major_version == '7'
block: block:
- name: install python-docker-py on red hat / centos - name: install python-docker-py on red hat / centos
@ -85,7 +88,6 @@
- name: red hat 8 based systems tasks - name: red hat 8 based systems tasks
when: when:
- ansible_os_family == 'RedHat'
- ansible_distribution_major_version == '8' - ansible_distribution_major_version == '8'
block: block:
- name: install podman - name: install podman

1
roles/ceph-mon/tasks/ceph_keys.yml
View File

@ -75,5 +75,4 @@
- /var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-rbd-mirror/{{ cluster }}.keyring
- /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
when: when:
- cephx
- inventory_hostname == groups[mon_group_name] | last - inventory_hostname == groups[mon_group_name] | last