From 34fb9da1bef459caaefc692e25d44db1a6e0e0a3 Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Fri, 22 Mar 2019 19:46:08 +0000
Subject: [PATCH] issue #570: add firewalld to always-fork list for now.

---
 ansible_mitogen/planner.py | 1 +
 docs/changelog.rst         | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ansible_mitogen/planner.py b/ansible_mitogen/planner.py
index 3c5bd64f..2eebd36d 100644
--- a/ansible_mitogen/planner.py
+++ b/ansible_mitogen/planner.py
@@ -296,6 +296,7 @@ class NewStylePlanner(ScriptPlanner):
     #: manner.
     ALWAYS_FORK_MODULES = frozenset([
         'dnf',  # issue #280; py-dnf/hawkey need therapy
+        'firewalld',  # issue #570: ansible module_utils caches dbus conn
     ])
 
     def should_fork(self):
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 22d7962a..a10ac883 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -27,13 +27,18 @@ Fixes
 * `#557 <https://github.com/dw/mitogen/issues/557>`_: fix a crash when running
   on machines with high CPU counts.
 
+* `#570 <https://github.com/dw/mitogen/issues/570>`_: the ``firewalld`` module
+  internally caches a dbus name that changes across ``firewalld`` restarts,
+  causing a failure if the service is restarted between ``firewalld`` module invocations.
+
 
 Thanks!
 ~~~~~~~
 
 Mitogen would not be possible without the support of users. A huge thanks for
 bug reports, testing, features and fixes in this release contributed by
-`Orion Poplawski <https://github.com/opoplawski>`_.
+`Orion Poplawski <https://github.com/opoplawski>`_, and
+`@Moumoutaru <https://github.com/Moumoutaru>`_.
 
 
 v0.2.6 (2019-03-06)