Merge pull request #34 from ait-aecid/development

Development
ait-aecid · Oct 30, 2024 · 266cef6 · 266cef6
2 parents e7756ef + 57fc846
commit 266cef6
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 45 deletions.
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
@@ -1,9 +1,3 @@
-- name: Install python3-cerberus
-  pip:
-    name: cerberus
-    executable: pip3
-    state: latest
-
 - name: pip self-update
   pip:
     name: pip

diff --git a/tasks/debian-buster.yml b/tasks/debian-buster.yml
@@ -4,12 +4,6 @@
     executable: pip3
     state: latest
 
-- name: Install python3-cerberus
-  pip:
-    name: cerberus
-    executable: pip3
-    state: latest
-
 - name: Install python3-kafka
   pip:
     name: kafka-python

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -150,6 +150,13 @@
     state: latest
     extra_args: "{{pip_extra_args}}"
 
+- name: Install python3-cerberus
+  pip:
+    name: cerberus
+    executable: pip3
+    state: latest
+    extra_args: "{{pip_extra_args}}"
+
 - name: Find zmq
   find:
     paths: "{{aminer_pythonpath}}"
@@ -164,6 +171,13 @@
     file_type: "directory"
   register: pyzmqlibs
 
+- name: Find cerberus
+  find:
+    paths: "{{aminer_pythonpath}}"
+    patterns: 'cerberus'
+    file_type: "directory"
+  register: cerberus
+
 - name: Link zmq
   file:
     src: "{{ item.path }}"
@@ -178,6 +192,13 @@
     state: link
   with_items: "{{pyzmqlibs.files }}"
 
+- name: Link cerberus
+  file:
+    src: "{{ item.path }}"
+    dest: "/etc/aminer/conf-enabled/{{item.path.split('/')[-1]}}"
+    state: link
+  with_items: "{{cerberus.files }}"
+
 - name: Find json.cpython
   find:
     paths: "{{aminer_pythonpath}}"
@@ -220,20 +241,6 @@
     state: link
   with_items: "{{scipy.files }}"
 
-- name: Find cerberus
-  find:
-    paths: "{{aminer_pythonpath}}"
-    patterns: 'cerberus'
-    file_type: "directory"
-  register: cerberus
-
-- name: Link cerberus
-  file:
-    src: "{{ item.path }}"
-    dest: "/etc/aminer/conf-enabled/{{item.path.split('/')[-1]}}"
-    state: link
-  with_items: "{{cerberus.files }}"
-
 - name: Find kafka
   find:
     paths: "{{aminer_pythonpath}}"
@@ -262,12 +269,6 @@
     state: link
   with_items: "{{numpy.files }}"
 
-- name: Link python3-pkg_resources
-  file:
-    src: "{{aminer_pythonpath[0]}}/pkg_resources"
-    dest: "/etc/aminer/conf-enabled/pkg_resources"
-    state: link
-
 - name: Link yaml
   file:
     src: "{{aminer_pythonpath[0]}}/yaml"

diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -4,11 +4,9 @@ aminer_packages:
         - python3-pytz
         - python3-scipy
         - python3-numpy
-        - python3-pkg-resources
         - python3-setuptools
         - python3-dateutil
         - python3-six
-        - python3-cerberus
         - python3-urllib3
         - python3-defusedxml
         - python3-yaml

diff --git a/vars/debian-bookworm.yml b/vars/debian-bookworm.yml
@@ -4,11 +4,9 @@ aminer_packages:
         - python3-tz
         - python3-scipy
         - python3-numpy
-        - python3-pkg-resources
         - python3-setuptools
         - python3-dateutil
         - python3-six
-        - python3-cerberus
         - python3-kafka
         - python3-urllib3
         - python3-statsmodels

diff --git a/vars/debian-bullseye.yml b/vars/debian-bullseye.yml
@@ -4,11 +4,9 @@ aminer_packages:
         - python3-tz
         - python3-scipy
         - python3-numpy
-        - python3-pkg-resources
         - python3-setuptools
         - python3-dateutil
         - python3-six
-        - python3-cerberus
         - python3-kafka
         - python3-urllib3
         - python3-statsmodels

diff --git a/vars/debian-buster.yml b/vars/debian-buster.yml
@@ -4,7 +4,6 @@ aminer_packages:
         - python3-tz
         - python3-scipy
         - python3-numpy
-        - python3-pkg-resources
         - python3-setuptools
         - python3-dateutil
         - python3-six

diff --git a/vars/fedora.yml b/vars/fedora.yml
@@ -4,11 +4,9 @@ aminer_packages:
         - python3-pytz
         - python3-scipy
         - python3-numpy
-        - python3-pkg-resources
         - python3-setuptools
         - python3-dateutil
         - python3-six
-        - python3-cerberus
         - python3-kafka
         - python3-urllib3
         - python3-statsmodels

diff --git a/vars/ubuntu-2004.yml b/vars/ubuntu-2004.yml
@@ -4,11 +4,9 @@ aminer_packages:
         - python3-tz
         - python3-scipy
         - python3-numpy
-        - python3-pkg-resources
         - python3-setuptools
         - python3-dateutil
         - python3-six
-        - python3-cerberus
         - python3-kafka
         - python3-urllib3
         - python3-statsmodels

diff --git a/vars/ubuntu-2204.yml b/vars/ubuntu-2204.yml
@@ -4,11 +4,9 @@ aminer_packages:
         - python3-tz
         - python3-scipy
         - python3-numpy
-        - python3-pkg-resources
         - python3-setuptools
         - python3-dateutil
         - python3-six
-        - python3-cerberus
         - python3-kafka
         - python3-urllib3
         - python3-statsmodels