diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9840a4ee19..94db66b6db 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -255,6 +255,7 @@ Changed changes at https://github.com/StackStorm/orquesta/releases/tag/v1.1.0 and the st2 upgrade notes for potential impact. (improvement) * Update st2 nginx config to remove deprecated ``ssl on`` option. #4917 (improvement) +* Updated and tested tooz to v2.8.0 to apply fix for consul coordination heartbeat (@punkrokk @winem) #5121 Fixed ~~~~~ diff --git a/fixed-requirements.txt b/fixed-requirements.txt index 3804f1d34f..39f8c9f709 100644 --- a/fixed-requirements.txt +++ b/fixed-requirements.txt @@ -24,7 +24,7 @@ networkx==1.11 # NOTE: Recent version substantially affect the performance and add big import time overhead # See https://github.com/StackStorm/st2/issues/4160#issuecomment-394386433 for details oslo.config>=1.12.1,<1.13 -oslo.utils>=3.36.2,<=3.37.0 +oslo.utils<5.0,>=4.0.0 paramiko==2.7.1 passlib==1.7.1 prance==0.9.0 @@ -45,7 +45,7 @@ six==1.13.0 # NOTE: sseclient has various issues which sometimes hang the connection for a long time, etc. sseclient-py==1.7 stevedore==1.30.1 -tooz==1.66.1 +tooz==2.8.0 # Note: We use latest version of virtualenv which uses pip 19 virtualenv==16.6.0 webob==1.8.5 diff --git a/requirements.txt b/requirements.txt index 5dc0bb6729..bd092ab853 100644 --- a/requirements.txt +++ b/requirements.txt @@ -37,7 +37,7 @@ nose nose-parallel==0.3.1 nose-timer==0.7.5 oslo.config<1.13,>=1.12.1 -oslo.utils<=3.37.0,>=3.36.2 +oslo.utils<5.0,>=4.0.0 paramiko==2.7.1 passlib==1.7.1 prettytable @@ -62,7 +62,7 @@ simplejson six==1.13.0 sseclient-py==1.7 stevedore==1.30.1 -tooz==1.66.1 +tooz==2.8.0 ujson==1.35 unittest2 webob==1.8.5 diff --git a/st2actions/requirements.txt b/st2actions/requirements.txt index 987fbddc9d..2ef4e057a8 100755 --- a/st2actions/requirements.txt +++ b/st2actions/requirements.txt @@ -14,7 +14,7 @@ jinja2==2.10.3 kombu==4.6.6 lockfile==0.12.2 oslo.config<1.13,>=1.12.1 -oslo.utils<=3.37.0,>=3.36.2 +oslo.utils<5.0,>=4.0.0 pyinotify==0.9.6 ; platform_system == "Linux" python-dateutil==2.8.0 python-json-logger diff --git a/st2api/requirements.txt b/st2api/requirements.txt index 051999210c..e9f8dca18f 100644 --- a/st2api/requirements.txt +++ b/st2api/requirements.txt @@ -11,7 +11,7 @@ jsonschema==2.6.0 kombu==4.6.6 mongoengine==0.18.2 oslo.config<1.13,>=1.12.1 -oslo.utils<=3.37.0,>=3.36.2 +oslo.utils<5.0,>=4.0.0 pymongo==3.10.0 simplejson six==1.13.0 diff --git a/st2common/requirements.txt b/st2common/requirements.txt index fe9e8732fa..8c5602adcc 100644 --- a/st2common/requirements.txt +++ b/st2common/requirements.txt @@ -35,7 +35,7 @@ retrying==1.3.3 routes==2.4.1 semver==2.9.0 six==1.13.0 -tooz==1.66.1 +tooz==2.8.0 ujson==1.35 webob==1.8.5 zake==0.2.2 diff --git a/st2stream/requirements.txt b/st2stream/requirements.txt index 7a920a843f..fe3cbd71d7 100644 --- a/st2stream/requirements.txt +++ b/st2stream/requirements.txt @@ -11,6 +11,6 @@ jsonschema==2.6.0 kombu==4.6.6 mongoengine==0.18.2 oslo.config<1.13,>=1.12.1 -oslo.utils<=3.37.0,>=3.36.2 +oslo.utils<5.0,>=4.0.0 pymongo==3.10.0 six==1.13.0