diff --git a/etc/cloudpulse/cloudpulse-config-generator.conf b/etc/cloudpulse/cloudpulse-config-generator.conf
new file mode 100644
index 0000000..fd8c13b
--- /dev/null
+++ b/etc/cloudpulse/cloudpulse-config-generator.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+output_file = etc/cloudpulse/cloudpulse.conf.sample
+wrap_width = 79
+namespace = cloudpulse
+namespace = oslo.messaging
+namespace = oslo.db
+namespace = keystonemiddleware.auth_token
diff --git a/setup.cfg b/setup.cfg
index 8f4e6a9..0beff9e 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -32,6 +32,8 @@ all_files = 1
 [entry_points]
 console_scripts =
 	cloudpulse-server = cloudpulse.cmd.api:main
+oslo.config.opts =
+    cloudpulse = cloudpulse.opts:list_opts
 
 [upload_sphinx]
 upload-dir = doc/build/html
diff --git a/tox.ini b/tox.ini
index a0301e7..172113b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -18,6 +18,9 @@ commands = flake8
 [testenv:venv]
 commands = {posargs}
 
+[testenv:genconfig]
+commands = oslo-config-generator --config-file etc/cloudpulse/cloudpulse-config-generator.conf
+
 [testenv:cover]
 commands = python setup.py test --coverage --testr-args='{posargs}'