From d828e005c83d9fb925565defac9ea12eda6786a3 Mon Sep 17 00:00:00 2001
From: saltydk <salty@saltbox.dev>
Date: Tue, 28 May 2024 23:48:22 +0200
Subject: [PATCH] common: move apprise and certbot into ansible venv

---
 requirements/requirements-docker-controller.txt |  2 +-
 requirements/requirements-lint.txt              |  6 +++---
 requirements/requirements-saltbox.txt           | 10 ++++++----
 roles/common/tasks/main.yml                     | 17 -----------------
 4 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/requirements/requirements-docker-controller.txt b/requirements/requirements-docker-controller.txt
index ea051035f3..9d03453038 100644
--- a/requirements/requirements-docker-controller.txt
+++ b/requirements/requirements-docker-controller.txt
@@ -7,8 +7,8 @@ dnspython==2.6.1
 docker==7.1.0
 email_validator==2.1.1
 exceptiongroup==1.2.1
-fastapi==0.111.0
 fastapi-cli==0.0.4
+fastapi==0.111.0
 h11==0.14.0
 httpcore==1.0.5
 httptools==0.6.1
diff --git a/requirements/requirements-lint.txt b/requirements/requirements-lint.txt
index 496c4f176a..31a8df2633 100644
--- a/requirements/requirements-lint.txt
+++ b/requirements/requirements-lint.txt
@@ -1,5 +1,5 @@
-ansible==9.6.0
 ansible-lint==24.5.0
+ansible==9.6.0
 attrs==23.2.0
 black==24.4.2
 bracex==2.4
@@ -10,8 +10,8 @@ filelock==3.14.0
 importlib_metadata==7.1.0
 Jinja2==3.1.4
 jmespath==1.0.1
-jsonschema==4.22.0
 jsonschema-specifications==2023.12.1
+jsonschema==4.22.0
 markdown-it-py==3.0.0
 MarkupSafe==2.1.5
 mdurl==0.1.2
@@ -26,8 +26,8 @@ referencing==0.35.1
 resolvelib==1.0.1
 rich==13.7.1
 rpds-py==0.18.1
-ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.8
+ruamel.yaml==0.18.6
 subprocess-tee==0.4.1
 wcmatch==8.5.2
 yamllint==1.35.1
diff --git a/requirements/requirements-saltbox.txt b/requirements/requirements-saltbox.txt
index fbbadb1f33..c0c79acea4 100644
--- a/requirements/requirements-saltbox.txt
+++ b/requirements/requirements-saltbox.txt
@@ -1,10 +1,12 @@
-ansible==9.6.0
 ansible-lint==24.5.0
-argon2-cffi==23.1.0
+ansible==9.6.0
+apprise==1.8.0
 argon2-cffi-bindings==21.2.0
+argon2-cffi==23.1.0
 attrs==23.2.0
 black==24.4.2
 bracex==2.4
+certbot==2.10.0
 certifi==2024.2.2
 cffi==1.16.0
 charset-normalizer==3.3.2
@@ -17,8 +19,8 @@ idna==3.7
 importlib_metadata==7.1.0
 Jinja2==3.1.4
 jmespath==1.0.1
-jsonschema==4.22.0
 jsonschema-specifications==2023.12.1
+jsonschema==4.22.0
 lxml==5.2.2
 markdown-it-py==3.0.0
 MarkupSafe==2.1.5
@@ -41,8 +43,8 @@ requests==2.31.0
 resolvelib==1.0.1
 rich==13.7.1
 rpds-py==0.18.1
-ruamel.yaml==0.18.6
 ruamel.yaml.clib==0.2.8
+ruamel.yaml==0.18.6
 setuptools==70.0.0
 subprocess-tee==0.4.1
 tld==0.13
diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml
index 504e86bcbf..86928a43d5 100644
--- a/roles/common/tasks/main.yml
+++ b/roles/common/tasks/main.yml
@@ -108,23 +108,6 @@
     name:
       - "run-one"
 
-- name: Install common Python packages (System Python)
-  ansible.builtin.pip:
-    name:
-      - "apprise"
-      - "certbot"
-    executable: pip3
-    state: "latest"
-  when: ansible_distribution_version is version('22.04', '<=')
-
-- name: Install common Python apt packages (System Python)
-  ansible.builtin.apt:
-    state: present
-    name:
-      - "apprise"
-      - "certbot"
-  when: ansible_distribution_version is version('24.04', '>=')
-
 - name: Fetch PCI Info
   ansible.builtin.shell: "lspci -v -s $(lspci | grep -E '.*VGA.*Intel.*' | cut -d' ' -f 1) 2>/dev/null || :"
   register: lscpi_resp