updated var and remove packages tasks

itential · Jan 3, 2025 · ea9622a · ea9622a
1 parent f6cc8ea
commit ea9622a
Show file tree

Hide file tree

Showing 16 changed files with 85 additions and 7 deletions.
diff --git a/roles/gateway/tasks/main.yml b/roles/gateway/tasks/main.yml
@@ -290,12 +290,14 @@
     path: "{{ workingdir.path }}"
     state: absent
 
-- name: Uninstall gcc packages
+- name: Uninstall gateway build packages
   ansible.builtin.dnf:
     name: "{{ item }}"
     allowerasing: true
     autoremove: true
     state: absent
-  with_items:
-    - gcc
-    - gcc-c++
+  with_items: "{{ gateway_build_packages }}"
+  when:
+    - gateway_build_packages is defined
+    - gateway_build_packages is iterable
+    - gateway_build_packages | length > 0
diff --git a/roles/gateway/vars/2022.1-redhat-8.yml b/roles/gateway/vars/2022.1-redhat-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2022.1-rocky-8.yml b/roles/gateway/vars/2022.1-rocky-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.1-redhat-8.yml b/roles/gateway/vars/2023.1-redhat-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.1-redhat-9.yml b/roles/gateway/vars/2023.1-redhat-9.yml
@@ -5,6 +5,11 @@ gateway_packages:
   - gcc-c++
   - make
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.1-rocky-8.yml b/roles/gateway/vars/2023.1-rocky-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.1-rocky-9.yml b/roles/gateway/vars/2023.1-rocky-9.yml
@@ -5,6 +5,11 @@ gateway_packages:
   - gcc-c++
   - make
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - python3-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.2-redhat-8.yml b/roles/gateway/vars/2023.2-redhat-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.2-redhat-9.yml b/roles/gateway/vars/2023.2-redhat-9.yml
@@ -5,6 +5,11 @@ gateway_packages:
   - gcc-c++
   - make
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - python3-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.2-rocky-8.yml b/roles/gateway/vars/2023.2-rocky-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.2-rocky-9.yml b/roles/gateway/vars/2023.2-rocky-9.yml
@@ -5,6 +5,11 @@ gateway_packages:
   - gcc-c++
   - make
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - python3-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.3-redhat-8.yml b/roles/gateway/vars/2023.3-redhat-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.3-redhat-9.yml b/roles/gateway/vars/2023.3-redhat-9.yml
@@ -5,6 +5,11 @@ gateway_packages:
   - gcc-c++
   - make
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - python3-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.3-rocky-8.yml b/roles/gateway/vars/2023.3-rocky-8.yml
@@ -6,6 +6,12 @@ gateway_packages:
   - make
   - sqlite-devel
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - sqlite-devel
+  - python39-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/gateway/vars/2023.3-rocky-9.yml b/roles/gateway/vars/2023.3-rocky-9.yml
@@ -5,6 +5,11 @@ gateway_packages:
   - gcc-c++
   - make
 
+gateway_build_packages:
+  - gcc-c++
+  - make
+  - python3-devel
+
 python_version: 3.9
 python_executable: "/usr/bin/python{{ python_version }}"
 pip_executable: "/usr/bin/pip{{ python_version }}"

diff --git a/roles/redis/tasks/main.yml b/roles/redis/tasks/main.yml
@@ -99,6 +99,4 @@
     allowerasing: true
     autoremove: true
     state: absent
-  with_items:
-    - gcc
-    - gcc-c++
+  with_items: "{{ redis_build_packages[ansible_distribution_major_version] }}"