From: Guillaume Abrioux Date: Tue, 19 Jun 2018 08:48:25 +0000 (+0200) Subject: common: remove duplicate include of configure_firewall_rpm.yml X-Git-Tag: v3.1.0rc10~10 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=045ba36ea3178cd207d764a977383f0f7f19e281;p=ceph-ansible.git common: remove duplicate include of configure_firewall_rpm.yml 408ef69 has introduced a duplicated task, something went wrong with the backport from 24ef47b (probably a conflict merge hasn't been solved properly). It's better now to commit directly in stable-3.1 to definitely solve this issue. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1589146 Signed-off-by: Guillaume Abrioux --- diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 2c5013357..6eea5b546 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -12,13 +12,6 @@ # 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: