summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conductor/conductor/common/music/api.py3
-rw-r--r--conductor/requirements.txt2
-rw-r--r--conductor/test-requirements.txt1
3 files changed, 1 insertions, 5 deletions
diff --git a/conductor/conductor/common/music/api.py b/conductor/conductor/common/music/api.py
index 306f016..b3bb5fc 100644
--- a/conductor/conductor/common/music/api.py
+++ b/conductor/conductor/common/music/api.py
@@ -63,9 +63,6 @@ MUSIC_API_OPTS = [
cfg.IntOpt('replication_factor',
default=1,
help='Replication factor'),
- cfg.BoolOpt('debug',
- default=False,
- help='Log debug messages. Default value is False.'),
cfg.BoolOpt('mock',
default=False,
help='Use mock API'),
diff --git a/conductor/requirements.txt b/conductor/requirements.txt
index c587704..9359e26 100644
--- a/conductor/requirements.txt
+++ b/conductor/requirements.txt
@@ -5,7 +5,7 @@
cotyledon # Apache-2.0
futurist>=0.11.0 # Apache-2.0
lxml>=2.3 # BSD
-oslo.config<5.6.0,>=3.9.0 # Apache-2.0
+oslo.config>=3.9.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
oslo.log>=1.14.0 # Apache-2.0
# oslo.policy>=0.5.0 # Apache-2.0
diff --git a/conductor/test-requirements.txt b/conductor/test-requirements.txt
index 3150f00..c0e68d0 100644
--- a/conductor/test-requirements.txt
+++ b/conductor/test-requirements.txt
@@ -11,7 +11,6 @@ kombu>=3.0.25 # BSD
mock>=2.0 # BSD
mox3>=0.7.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
-psycopg2>=2.5 # LGPL/ZPL
testrepository>=0.0.18 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=1.4.0 # MIT