From 59f3543dd9a428b8bf76ddc7be68f7f6460775c2 Mon Sep 17 00:00:00 2001
From: Erik Reid <erik.reid@geant.org>
Date: Tue, 28 May 2019 15:41:54 +0200
Subject: [PATCH] newer celery requires newer redis-py
---
inventory_provider/tasks/config.py | 12 +++++++++---
requirements.txt | 4 ++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/inventory_provider/tasks/config.py b/inventory_provider/tasks/config.py
index 846a2c21..3caa57d1 100644
--- a/inventory_provider/tasks/config.py
+++ b/inventory_provider/tasks/config.py
@@ -1,12 +1,18 @@
import json
from os import getenv
+import logging
+
+logger = logging.getLogger(__name__)
+
broker_url = getenv(
'CELERY_BROKER_URL',
default='redis://test-dashboard02.geant.org:6379/1')
-result_backend = getenv(
- 'CELERY_BROKER_URL',
- default='redis://test-dashboard02.geant.org:6379/1')
+
+result_backend = broker_url
+if result_backend:
+ # bugfix workaround
+ result_backend = result_backend.split(';')[0]
tmp_options = getenv(
'BROKER_TRANSPORT_OPTIONS',
diff --git a/requirements.txt b/requirements.txt
index 815ac1d5..c9b0f1e2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,8 +4,8 @@ pysnmp
jsonschema
paramiko
flask
-redis
-celery
+redis==3.2.1
+celery==4.3.0
junos-eznc
lxml
requests
--
GitLab