From 8dafb5c945e6b8ffce3bf7fc257123a7536dacfb Mon Sep 17 00:00:00 2001 From: Wang Jian Date: Fri, 1 Jul 2016 11:54:20 +0800 Subject: [PATCH] fix redis requirement and import hiredis 1. Dragonflow's requirement.txt should not contain redis, just like Nova's requirement.txt doesn't contain libvirt. Because they are not required. 2. According to redis-py doc, redis-py use HiredisParser by default, which is much faster. https://github.com/andymccurdy/redis-py/#parsers 3. About global requirement pls refer to https://review.openstack.org/#/c/337683/4 Change-Id: Id973e7af41764e68d13d2374c95ccf4fad72ec50 --- devstack/redis_driver | 3 ++- requirements.txt | 1 - test-requirements.txt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/devstack/redis_driver b/devstack/redis_driver index e66d85f91..f47c7b2f9 100644 --- a/devstack/redis_driver +++ b/devstack/redis_driver @@ -88,7 +88,8 @@ function nb_db_driver_install_server { } function nb_db_driver_install_client { - sudo pip install redis + sudo pip install redis>=2.10.0 + sudo pip install hiredis>=0.2.0 } function nb_db_driver_status_server diff --git a/requirements.txt b/requirements.txt index b98211f37..96cc87987 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,4 +18,3 @@ oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 oslo.reports>=0.6.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 -redis>=2.10.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index e0a628230..6bd25bdee 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -14,4 +14,6 @@ oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT +redis>=2.10.0 # MIT +hiredis>=0.2.0 # BSD reno>=1.8.0 # Apache2