@@ -30,6 +30,13 @@ DATABASE = {
30
30
'CONN_MAX_AGE' : {{ netbox_database_conn_age }},
31
31
}
32
32
33
+ {% if netbox_stable and netbox_stable_version is version ('2.9.4' , '>=' ) or
34
+ netbox_git and _netbox_git_contains_rq_timeout .rc == 0 % }
35
+ {% set _default_timeout = "RQ_DEFAULT_TIMEOUT" % }
36
+ {% else % }
37
+ {% set _default_timeout = "DEFAULT_TIMEOUT" % }
38
+ {% endif % }
39
+
33
40
REDIS = {
34
41
{# https://github.com/netbox-community/netbox/pull/4366 #}
35
42
{% if netbox_stable and netbox_stable_version is version ('2.7.11' , '>=' ) or
@@ -42,15 +49,15 @@ REDIS = {
42
49
'PORT' : {{ netbox_redis_port }},
43
50
'PASSWORD' : '{{ netbox_redis_password }}' ,
44
51
'DATABASE' : {{ netbox_redis_database }},
45
- 'RQ_DEFAULT_TIMEOUT ' : {{ netbox_redis_default_timeout }},
52
+ '{{ _default_timeout }} ' : {{ netbox_redis_default_timeout }},
46
53
'SSL' : {{ netbox_redis_ssl_enabled }},
47
54
},
48
55
'caching' : {
49
56
'HOST' : '{{ netbox_redis_cache_host }}' ,
50
57
'PORT' : {{ netbox_redis_cache_port }},
51
58
'PASSWORD' : '{{ netbox_redis_cache_password }}' ,
52
59
'DATABASE' : {{ netbox_redis_cache_database }},
53
- 'RQ_DEFAULT_TIMEOUT ' : {{ netbox_redis_cache_default_timeout }},
60
+ '{{ _default_timeout }} ' : {{ netbox_redis_default_timeout }},
54
61
'SSL' : {{ netbox_redis_cache_ssl_enabled }},
55
62
}
56
63
}
0 commit comments