feat: add compat for latest mongodb version

rolehippie · Oct 26, 2024 · fc15e02 · fc15e02
1 parent 5a7c4be
commit fc15e02
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -2,9 +2,15 @@
 # @var mongodb_server_version:description: Version of MongoDB that gets installed
 mongodb_server_version: "8.0"
 
+# @var mongodb_packages:description: List of packages to install for mongodb
+mongodb_packages:
+    - mongodb-org
+    - numactl
+    - python3-pip
+    - python3-pymongo
+
 # @var mongodb_server_version:description: Version of pymongo installed via pip
-# renovate: datasource=pypi depName=pymongo
-mongodb_pymongo_version: 3.12.3
+mongodb_pymongo_version: False
 
 # @var mongodb_limit_files:description: Limit for open files for the mongod service
 mongodb_limit_files: 1048576
@@ -233,6 +239,9 @@ mongodb_user: mongodb
 # @var mongodb_keyring:description: Path for the repository keyring
 mongodb_keyring: /usr/share/keyrings/mongodb-{{ mongodb_server_version }}-archive-keyring.gpg
 
+# @var mongodb_numa_enabled:description: Enable if the system supports NUMA policies
+mongodb_numa_enabled: True
+
 # @var mongodb_backup_enabled:description: Enable or disable the backup script
 mongodb_backup_enabled: False
 

diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -2,7 +2,7 @@
 - name: Converge
   hosts: all
   vars:
-    mongodb_server_version: "6.0"
+    mongodb_numa_enabled: False
   roles:
     - role: rolehippie.mongodb
 

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -59,21 +59,21 @@
     - mongodb
 
 - name: Install required packages
-  loop:
-    - mongodb-org
-    - numactl
-    - python3-pip
+  loop: "{{ mongodb_packages }}"
   ansible.builtin.package:
     name: "{{ item }}"
     state: present
   tags:
     - mongodb
 
 - name: Install pymongo pip
+  when:
+    - mongodb_pymongo_version | default(False)
   ansible.builtin.pip:
     name: pymongo
     state: "{{ mongodb_pymongo_version is defined | ternary('present', 'latest') }}"
     version: "{{ mongodb_pymongo_version | default(omit) }}"
+    break_system_packages: True
   tags:
     - mongodb
 

diff --git a/templates/config.j2 b/templates/config.j2
@@ -38,8 +38,10 @@ storage:
   dbPath: {{ mongodb_storage_path }}
   directoryPerDB: {{ mongodb_storage_dirperdb | lower }}
   engine: {{ mongodb_storage_engine }}
+{% if mongodb_server_version is version("6.1", "<") %}
   journal:
     enabled: {{ mongodb_storage_journal_enabled | lower }}
+{% endif %}
 {% if mongodb_storage_engine == 'mmapv1' %}
   mmapv1:
     quota:
@@ -68,7 +70,7 @@ systemLog:
 operationProfiling:
   slowOpThresholdMs: {{ mongodb_operation_profiling_slow_op_threshold_ms }}
   mode: {{ mongodb_operation_profiling_mode }}
-{% if mongodb_server_version is version("4.0", ">=") %}
+{% if mongodb_server_version is version("4.0", ">=") and mongodb_server_version is version("5.0", "<") %}
 
 cloud:
   monitoring:

diff --git a/templates/service.j2 b/templates/service.j2
@@ -18,7 +18,7 @@ LimitNPROC={{ mongodb_limit_procs }}
 TasksAccounting=false
 
 EnvironmentFile=/etc/default/mongod
-ExecStart=/usr/bin/numactl --interleave=all /usr/bin/mongod --config /etc/mongod.conf
+ExecStart={% if mongodb_numa_enabled %}/usr/bin/numactl --interleave=all {% endif %}/usr/bin/mongod --config /etc/mongod.conf
 PIDFile={{ mongodb_pidfile_path }}
 
 [Install]