Skip to content

Commit

Permalink
Backport fix for fw_offline/FW_VERSION globals in firewalld (#39394)
Browse files Browse the repository at this point in the history 
Fixes #38161

Signed-off-by: Adam Miller <admiller@redhat.com>
  • Loading branch information
@maxamillion
maxamillion committed Apr 26, 2018
1 parent a02592b commit c1d91bf
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/ansible/modules/system/firewalld.py
View file
Expand Up @@ -155,6 +155,8 @@

# globals
module = None
fw_offline = False
FW_VERSION = None

# Imports
try:
Expand All @@ -165,7 +167,6 @@
from firewall.client import FirewallClient
from firewall.client import FirewallClientZoneSettings
fw = None
fw_offline = False
import_failure = False

try:
Expand Down

1 comment on commit c1d91bf

@Abukamel
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have applied the fix on Ubuntu 16.04 at file /usr/lib/python2.7/dist-packages/ansible/modules/system/firewalld.py as you see in screenshot
image

It gives an error about firewall version now failed: [localhost] (item=22) => {"changed": false, "item": 22, "msg": "unsupported version of firewalld, requires >= 0.2.11"}

image

It looks like the fix is not working

Please sign in to comment.