]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
common: remove duplicate include of configure_firewall_rpm.yml
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 19 Jun 2018 08:48:25 +0000 (10:48 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Tue, 19 Jun 2018 13:04:26 +0000 (15:04 +0200)
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 <gabrioux@redhat.com>
roles/ceph-common/tasks/main.yml

index 2c5013357d029f64db642b98fe2a1d995b300e7e..6eea5b546e0257893f68760b47d8d093387b8c09 100644 (file)
   # 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: