From d6f13f94f008a60f2e34cc97098d92eeb0f9cd2c 2024-03-04 23:27:28
From: Branko Majic <branko@majic.rs>
Date: 2024-03-04 23:27:28
Subject: [PATCH] MAR-192: Fix missing dnspython library as requiremnts for running the roles:

- Turns out there is still one usage left in the mail_forwarder role.
- It might be a good idea to try to get rid of that single usage to
  make the firewall coming up more reliable during boot time.

---

diff --git a/docs/about.rst b/docs/about.rst
index 9fb78c091c9954db639666f03b440c504f2ae2ee..0834526b09bc910e288446674e365b1e3d293e14 100644
--- a/docs/about.rst
+++ b/docs/about.rst
@@ -17,9 +17,10 @@ supported releases, see :ref:`rolereference`.
 At the moment, the roles have been written for and tested against **Ansible
 2.9.x**.
 
-The role also utilises the ``ipv4/ipv6`` lookup plugins which require
-``netaddr`` package to be installed. Make sure you have the package
-available on controller machine.
+The roles also utilise the ``dig`` and ``ipv4/ipv6`` lookup plugins
+which require ``dnspython`` and ``netaddr`` packages (respectively) to
+be installed. Make sure you have the packages available on controller
+machine.
 
 
 Why were these roles created?
diff --git a/docs/index.rst b/docs/index.rst
index 178030c618a428c8302aba7c24b1f6e97b288ba4..02b9e50eb7c6f49062d451e393c787a43da2d77b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -17,9 +17,10 @@ supported releases, see :ref:`rolereference`.
 At the moment, the roles have been written for and tested against **Ansible
 2.9.x**.
 
-The role also utilises the ``ipv4/ipv6`` lookup plugins which require
-``netaddr`` package to be installed. Make sure you have the package
-available on controller machine.
+The roles also utilise the ``dig`` and ``ipv4/ipv6`` lookup plugins
+which require ``dnspython`` and ``netaddr`` packages (respectively) to
+be installed. Make sure you have the packages available on controller
+machine.
 
 
 Contents
diff --git a/docs/releasenotes.rst b/docs/releasenotes.rst
index c3fff24be08de2432395dc1d770067b6b18544f2..d5b738fb60826a13e465966baa8383fe1b35a227 100644
--- a/docs/releasenotes.rst
+++ b/docs/releasenotes.rst
@@ -14,8 +14,6 @@ Debian 12 Bookworm. Some minor improvements and fixes.
 
   * Dropped support for Debian 10 (Buster).
   * Added support for Debian 12 (Bookworm).
-  * ``dnspython`` Python package is no longer required/used by any of
-    the roles.
   * ``netaddr`` Python package is now required for using the roles.
 
 * ``backup_client`` role
@@ -45,7 +43,9 @@ Debian 12 Bookworm. Some minor improvements and fixes.
   * Parameter ``maintenance_allowed_hosts`` has been dropped and
     replaced with parameter ``maintenance_allowed_sources``. The new
     parameter expects a list of IPv4 and IPv6 addresses (or
-    subnets). Resolvable names can no longer be specified.
+    subnets). Resolvable names can no longer be specified (and this
+    particular role no longe relies on presence of the ``dnspython``
+    package).
 
   * NTP server configuration is now based on use of pools instead of
     servers. Parameter ``ntp_servers`` has been deprecated and
diff --git a/docs/usage.rst b/docs/usage.rst
index d13a877ece8b0b193dfc63456843896aabd20968..439d0dcdba01c671cb3ea8baf988ab2cd2fe2b04 100644
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -148,11 +148,12 @@ packages, and to prepare the environment a bit on the Ansible server:
      mkdir ~/mysite/
      mkvirtualenv -p /usr/bin/python3 -a ~/mysite/ mysite
      pip install -U pip setuptools
-     pip install 'ansible~=2.9.0' netaddr
+     pip install 'ansible~=2.9.0' dnspython netaddr
 
 .. warning::
-   The ``netaddr`` package is important since it is used internally via
-   ``ipv4/ipv6`` lookup plugin.
+   The ``dnspython`` and ``netaddr`` packages are needed since they
+   are used internally by some of the roles for the ``dig`` and
+   ``ipv4/ipv6`` lookup plugins.
 
 
 Cloning the *Majic Ansible Roles*
diff --git a/requirements.in b/requirements.in
index 7c588b1ba82a4cac6be32bf1b279cde2a7dbd978..190917c3f2cd61b19b54f3458d6a87a03cf88846 100644
--- a/requirements.in
+++ b/requirements.in
@@ -1,5 +1,6 @@
 ansible~=2.9.0
 defusedxml
+dnspython
 gimmecert~=0.5.0
 molecule~=2.22.0
 netaddr
diff --git a/requirements.txt b/requirements.txt
index ec869ee16fdd0e6b5ecab0742da1b81f71bf2b87..459e657d6eb7373169a1ccd7dd9e0029c67f77dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -68,6 +68,8 @@ defusedxml==0.7.1
     # via -r requirements.in
 distlib==0.3.8
     # via virtualenv
+dnspython==2.6.1
+    # via -r requirements.in
 docutils==0.20.1
     # via
     #   sphinx