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

infra: fix wrong condition on firewalld start task 

a non skipped task won't have the `skipped` attribute, so `start
firewalld` task will complain about that.
Indeed, `skipped` and `rc` attributes won't exist since the first task
`check firewalld installation on redhat or suse` won't be skipped in
case of non-containerized deployment.

Fixes: #3236
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1541840

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3192/head
Guillaume Abrioux 2018-10-16 15:09:48 +02:00 committed by mergify[bot]
parent ac37a0d0cd
commit f0b2d82695
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
roles/ceph-infra/tasks/configure_firewall.yml
View File

@ -18,8 +18,7 @@
state: started state: started
enabled: yes enabled: yes
when: when:
- not firewalld_pkg_query.skipped - firewalld_pkg_query.get('rc', 1) == 0
- firewalld_pkg_query.rc == 0
or is_atomic or is_atomic
- name: open monitor ports - name: open monitor ports
@ -34,7 +33,7 @@
when: when:
- mon_group_name is defined - mon_group_name is defined
- mon_group_name in group_names - mon_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -50,7 +49,7 @@
when: when:
- mgr_group_name is defined - mgr_group_name is defined
- mgr_group_name in group_names - mgr_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -69,7 +68,7 @@
when: when:
- osd_group_name is defined - osd_group_name is defined
- osd_group_name in group_names - osd_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -85,7 +84,7 @@
when: when:
- rgw_group_name is defined - rgw_group_name is defined
- rgw_group_name in group_names - rgw_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -101,7 +100,7 @@
when: when:
- mds_group_name is defined - mds_group_name is defined
- mds_group_name in group_names - mds_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -117,7 +116,7 @@
when: when:
- nfs_group_name is defined - nfs_group_name is defined
- nfs_group_name in group_names - nfs_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -133,7 +132,7 @@
when: when:
- nfs_group_name is defined - nfs_group_name is defined
- nfs_group_name in group_names - nfs_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -149,7 +148,7 @@
when: when:
- restapi_group_name is defined - restapi_group_name is defined
- restapi_group_name in group_names - restapi_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -165,7 +164,7 @@
when: when:
- rbdmirror_group_name is defined - rbdmirror_group_name is defined
- rbdmirror_group_name in group_names - rbdmirror_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall
@ -181,7 +180,7 @@
when: when:
- iscsi_group_name is defined - iscsi_group_name is defined
- iscsi_group_name in group_names - iscsi_group_name in group_names
- firewalld_pkg_query.rc == 0 - (firewalld_pkg_query.get('rc', 1) == 0 or is_atomic)
tags: tags:
- firewall - firewall