Perform version check for Netbox 2.9.4 for RQ_DEFAULT_TIMEOUT

Author: lae

tasks/install_via_git.yml

@@ -33,6 +33,15 @@
   changed_when: False
   failed_when: "_netbox_git_contains_tasks_rename.rc not in [0, 1]"
 
+- name: Check existence of commit 90dbe9b, renaming DEFAULT_TIMEOUT to RQ_DEFAULT_TIMEOUT
+  shell: 'set -o pipefail; git log --format=%H "{{ netbox_git_version }}" | grep ^90dbe9bf60ab3c72be10fd070c65c26dca543ca5'
+  args:
+    chdir: "{{ netbox_git_repo_path }}"
+    executable: /bin/bash
+  register: _netbox_git_contains_rq_timeout
+  changed_when: False
+  failed_when: "_netbox_git_contains_rq_timeout.rc not in [0, 1]"
+
 - name: Archive and extract snapshot of git repository
   shell: 'set -o pipefail; git archive "{{ netbox_git_version }}" | tar -x -C "{{ netbox_git_deploy_path }}"'
   args:

templates/configuration.py.j2

@@ -30,6 +30,13 @@ DATABASE = {
     'CONN_MAX_AGE': {{ netbox_database_conn_age }},
 }
 
+{% if netbox_stable and netbox_stable_version is version('2.9.4', '>=') or
+      netbox_git and _netbox_git_contains_rq_timeout.rc == 0 %}
+{% set _default_timeout = "RQ_DEFAULT_TIMEOUT" %}
+{% else %}
+{% set _default_timeout = "DEFAULT_TIMEOUT" %}
+{% endif %}
+
 REDIS = {
 {# https://github.com/netbox-community/netbox/pull/4366 #}
 {% if netbox_stable and netbox_stable_version is version('2.7.11', '>=') or
@@ -42,15 +49,15 @@ REDIS = {
         'PORT': {{ netbox_redis_port }},
         'PASSWORD': '{{ netbox_redis_password }}',
         'DATABASE': {{ netbox_redis_database }},
-        'RQ_DEFAULT_TIMEOUT': {{ netbox_redis_default_timeout }},
+        '{{ _default_timeout }}': {{ netbox_redis_default_timeout }},
         'SSL': {{ netbox_redis_ssl_enabled }},
     },
     'caching': {
         'HOST': '{{ netbox_redis_cache_host }}',
         'PORT': {{ netbox_redis_cache_port }},
         'PASSWORD': '{{ netbox_redis_cache_password }}',
         'DATABASE': {{ netbox_redis_cache_database }},
-        'RQ_DEFAULT_TIMEOUT': {{ netbox_redis_cache_default_timeout }},
+        '{{ _default_timeout }}': {{ netbox_redis_default_timeout }},
         'SSL': {{ netbox_redis_cache_ssl_enabled }},
     }
 }