From 2ebcf1687a978d52b5e24e818e021ed667b2b3a3 Mon Sep 17 00:00:00 2001 From: EKbfh Date: Mon, 30 Nov 2020 19:53:33 +0300 Subject: [PATCH 1/3] Fix consul check --- ansible/system_roles/consul/tasks/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/system_roles/consul/tasks/checks.yml b/ansible/system_roles/consul/tasks/checks.yml index 0e8a507fa7..f4d23dd189 100644 --- a/ansible/system_roles/consul/tasks/checks.yml +++ b/ansible/system_roles/consul/tasks/checks.yml @@ -55,7 +55,7 @@ - "'stdout' in current_consul_version" - current_consul_version.stdout != consul_version - has_svc_migrate_consul is not defined - - current_consul_version.stdout != "1.2.2" + - current_consul_version.stdout | version_compare("1.0.0", '<') when: - ansible_distribution != 'FreeBSD' -- GitLab From 111110d61d4a6fe0188aa9db95ae8bf387e267f9 Mon Sep 17 00:00:00 2001 From: Andrey Vertiprahov Date: Mon, 30 Nov 2020 19:21:28 +0000 Subject: [PATCH 2/3] Merge branch 'noc-fastapi-0.62' into 'master' FastAPI 0.62 See merge request noc/noc!4769 (cherry picked from commit af135d81c97643a1f0dd311f8171c9d342714603) a699b0ee FastAPI 0.62 --- requirements.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 15e7946103..af8f298a58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ # Basic node requirements Django==3.1.3 -FastAPI==0.61.1 +FastAPI==0.62.0 Jinja2==2.8 PyYAML==5.3.1 Pygments==2.2.0 @@ -59,10 +59,9 @@ python-multipart==0.0.5 pytz==2020.1 requests==2.20.0 setproctitle==1.1.10 -starlette==0.13.8 tornado==6.0.4 typing-extensions==3.7.4.3; python_version < '2.8' -uvicorn==0.12.1 +uvicorn==0.12.3 yappi==1.3.0 # Activator requirements ssh2-python==0.23.0; extra == "activator" -- GitLab From 51d2930a93f76cb15edb2f2c5520bc16640712ec Mon Sep 17 00:00:00 2001 From: EKbfh Date: Tue, 1 Dec 2020 00:20:02 +0300 Subject: [PATCH 3/3] Fix compare filter to test --- ansible/system_roles/consul/tasks/checks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/system_roles/consul/tasks/checks.yml b/ansible/system_roles/consul/tasks/checks.yml index f4d23dd189..0050c0a129 100644 --- a/ansible/system_roles/consul/tasks/checks.yml +++ b/ansible/system_roles/consul/tasks/checks.yml @@ -55,7 +55,7 @@ - "'stdout' in current_consul_version" - current_consul_version.stdout != consul_version - has_svc_migrate_consul is not defined - - current_consul_version.stdout | version_compare("1.0.0", '<') + - current_consul_version.stdout is version_compare("1.0.0", '<') when: - ansible_distribution != 'FreeBSD' -- GitLab