mirror of https://github.com/ceph/ceph-ansible.git
ceph-common: move firewall checks after package installation
We need to do this because on dev or rhcs installs ceph_stable_release is not mandatory and the firewall check tasks have a task that is conditional based off the installed version of ceph. If we perform those checks after package install then they will not fail on dev or rhcs installs. Signed-off-by: Andrew Schoen <aschoen@redhat.com>pull/2733/head
parent
7b156deb67
commit
24ef47b0e5
|
@ -1,18 +1,4 @@
|
||||||
---
|
---
|
||||||
- name: include checks/check_firewall.yml
|
|
||||||
include: checks/check_firewall.yml
|
|
||||||
when:
|
|
||||||
- check_firewall
|
|
||||||
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
|
|
||||||
static: False
|
|
||||||
|
|
||||||
- name: include misc/configure_firewall_rpm.yml
|
|
||||||
include: misc/configure_firewall_rpm.yml
|
|
||||||
when:
|
|
||||||
- ansible_os_family in ['RedHat', 'Suse']
|
|
||||||
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
|
|
||||||
static: False
|
|
||||||
|
|
||||||
- name: include installs/install_on_redhat.yml
|
- name: include installs/install_on_redhat.yml
|
||||||
include: installs/install_on_redhat.yml
|
include: installs/install_on_redhat.yml
|
||||||
when:
|
when:
|
||||||
|
@ -83,6 +69,20 @@
|
||||||
tags:
|
tags:
|
||||||
- always
|
- always
|
||||||
|
|
||||||
|
- name: include checks/check_firewall.yml
|
||||||
|
include: checks/check_firewall.yml
|
||||||
|
when:
|
||||||
|
- check_firewall
|
||||||
|
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
|
||||||
|
static: False
|
||||||
|
|
||||||
|
- name: include misc/configure_firewall_rpm.yml
|
||||||
|
include: misc/configure_firewall_rpm.yml
|
||||||
|
when:
|
||||||
|
- ansible_os_family in ['RedHat', 'Suse']
|
||||||
|
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
|
||||||
|
static: False
|
||||||
|
|
||||||
- name: include facts_mon_fsid.yml
|
- name: include facts_mon_fsid.yml
|
||||||
include: facts_mon_fsid.yml
|
include: facts_mon_fsid.yml
|
||||||
run_once: true
|
run_once: true
|
||||||
|
|
Loading…
Reference in New Issue