From: Andrew Schoen Date: Mon, 4 Jun 2018 15:36:32 +0000 (-0500) Subject: ceph-common: move firewall checks after package installation X-Git-Tag: v3.2.0beta1~46 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=24ef47b0e53732dff167c324133cfe2edb9093cc;p=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 --- diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 092cac398..e3e543fa4 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -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 include: installs/install_on_redhat.yml when: @@ -83,6 +69,20 @@ tags: - 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 include: facts_mon_fsid.yml run_once: true