diff --git a/senlin/openstack/common/eventlet_backdoor.py b/senlin/openstack/common/eventlet_backdoor.py
index fe65c9c41..c0f0de6ce 100644
--- a/senlin/openstack/common/eventlet_backdoor.py
+++ b/senlin/openstack/common/eventlet_backdoor.py
@@ -143,3 +143,7 @@ def initialize_if_enabled():
     eventlet.spawn_n(eventlet.backdoor.backdoor_server, sock,
                      locals=backdoor_locals)
     return port
+
+
+def list_opts():
+    yield None, eventlet_backdoor_opts
diff --git a/senlin/openstack/common/log.py b/senlin/openstack/common/log.py
index 038f81d89..d51f04adb 100644
--- a/senlin/openstack/common/log.py
+++ b/senlin/openstack/common/log.py
@@ -27,6 +27,7 @@ It also allows setting of formatting information through conf.
 
 """
 
+import copy
 import inspect
 import itertools
 import logging
@@ -708,3 +709,12 @@ class DeprecatedConfig(Exception):
 
     def __init__(self, msg):
         super(Exception, self).__init__(self.message % dict(msg=msg))
+
+
+def list_opts():
+    return [
+        (None, copy.deepcopy(common_cli_opts)),
+        (None, copy.deepcopy(logging_cli_opts)),
+        (None, copy.deepcopy(generic_log_opts)),
+        (None, copy.deepcopy(log_opts)),
+    ]
diff --git a/setup.cfg b/setup.cfg
index 380baa48e..9f0894424 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,13 @@ scripts =
 [entry_points]
 oslo.config.opts =
     senlin.common.config = senlin.common.config:list_opts
+    senlin.common.crypt = senlin.common.crypt:list_opts
     senlin.common.wsgi = senlin.common.wsgi:list_opts
+    senlin.engine.clients = senlin.engine.clients:list_opts
+    senlin.engine.notification = senlin.engine.notification:list_opts
+    senlin.openstack.common.eventlet_backdoor = senlin.openstack.common.eventlet_backdoor:list_opts
+    senlin.openstack.common.log = senlin.openstack.common.log:list_opts
+    senlin.openstack.common.policy = senlin.openstack.common.policy:list_opts
 
 senlin.clients =
     ceilometer = senlin.engine.clients.os.ceilometer:CeilometerClientPlugin
diff --git a/tox.ini b/tox.ini
index 84962cf14..3c7166515 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,8 +38,7 @@ deps = -r{toxinidir}/requirements.txt
 commands = python setup.py build_sphinx
 
 [testenv:genconfig]
-commands =
-  bash tools/config/generate_sample.sh -b . -p senlin -o etc/senlin
+commands = oslo-config-generator --config-file=config-generator.conf
 
 [flake8]
 # H404 multi line docstring should start with a summary