diff --git a/etc/rally/rally-config-generator.conf b/etc/rally/rally-config-generator.conf
index 16a6bf04..4c1b04a2 100644
--- a/etc/rally/rally-config-generator.conf
+++ b/etc/rally/rally-config-generator.conf
@@ -1,5 +1,6 @@
 [DEFAULT]
 output_file = etc/rally/rally.conf.sample
 namespace = rally
+namespace = rally_openstack
 namespace = oslo.db
 namespace = oslo.log
diff --git a/etc/rally/rally.conf.sample b/etc/rally/rally.conf.sample
index 1f41ac6a..ae4c3d2a 100644
--- a/etc/rally/rally.conf.sample
+++ b/etc/rally/rally.conf.sample
@@ -59,6 +59,10 @@
 # log_config_append is set. (string value)
 #syslog_log_facility = LOG_USER
 
+# Use JSON formatting for logging. This option is ignored if
+# log_config_append is set. (boolean value)
+#use_json = false
+
 # Log output to standard error. This option is ignored if
 # log_config_append is set. (boolean value)
 #use_stderr = true
@@ -117,10 +121,6 @@
 # From rally
 #
 
-# HTTP timeout for any of OpenStack service in seconds (floating point
-# value)
-#openstack_client_http_timeout = 180.0
-
 # Print debugging output only for Rally. Off-site components stay
 # quiet. (boolean value)
 #rally_debug = false
@@ -129,6 +129,14 @@
 # Minimum value: 1
 #raw_result_chunk_size = 1000
 
+#
+# From rally_openstack
+#
+
+# HTTP timeout for any of OpenStack service in seconds (floating point
+# value)
+#openstack_client_http_timeout = 180.0
+
 
 [database]
 
@@ -174,10 +182,14 @@
 # Deprecated group/name - [sql]/idle_timeout
 #connection_recycle_time = 3600
 
-# Minimum number of SQL connections to keep open in a pool. (integer
-# value)
+# DEPRECATED: Minimum number of SQL connections to keep open in a
+# pool. (integer value)
 # Deprecated group/name - [DEFAULT]/sql_min_pool_size
 # Deprecated group/name - [DATABASE]/sql_min_pool_size
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: The option to set the minimum pool size is not supported by
+# sqlalchemy.
 #min_pool_size = 1
 
 # Maximum number of SQL connections to keep open in a pool. Setting a
@@ -240,11 +252,15 @@
 # (integer value)
 #db_max_retries = 20
 
+# Optional URL parameters to append onto the connection URL at connect
+# time; specify as param1=value1&param2=value2&... (string value)
+#connection_parameters =
+
 
 [openstack]
 
 #
-# From rally
+# From rally_openstack
 #
 
 # Time to sleep after creating a resource before polling for it status
@@ -752,10 +768,18 @@
 # value)
 #flavor_ref_ram = 64
 
-# Alternate reference flavor RAM size used by test thatneed two
+# Alternate reference flavor RAM size used by test that need two
 # flavors, like those that resize an instance (integer value)
 #flavor_ref_alt_ram = 128
 
+# Primary flavor disk size in GiB used by most of the test cases
+# (integer value)
+#flavor_ref_disk = 5
+
+# Alternate reference flavor disk size in GiB used by tests that need
+# two flavors, like those that resize an instance (integer value)
+#flavor_ref_alt_disk = 5
+
 # RAM size flavor used for orchestration test cases (integer value)
 #heat_instance_type_ram = 64
 
@@ -799,3 +823,22 @@
 # this option, some external fields for identifying resources can be
 # applied. (boolean value)
 #pre_newton_neutron = false
+
+# Neutron L2 agent types to find hosts to bind (list value)
+#neutron_bind_l2_agent_types = Open vSwitch agent,Linux bridge agent
+
+# Octavia create loadbalancer timeout (floating point value)
+#octavia_create_loadbalancer_timeout = 500.0
+
+# Octavia delete loadbalancer timeout (floating point value)
+#octavia_delete_loadbalancer_timeout = 50.0
+
+# Octavia create loadbalancer poll interval (floating point value)
+#octavia_create_loadbalancer_poll_interval = 2.0
+
+# Mode of embedding OSProfiler's chart. Can be 'text' (embed only
+# trace id), 'raw' (embed raw osprofiler's native report) or a path to
+# directory (raw osprofiler's native reports for each iteration will
+# be saved separately there to decrease the size of rally report
+# itself) (string value)
+#osprofiler_chart_mode = <None>
diff --git a/rally_openstack/__init__.py b/rally_openstack/__init__.py
index 77821364..daba371f 100644
--- a/rally_openstack/__init__.py
+++ b/rally_openstack/__init__.py
@@ -28,7 +28,7 @@ if __rally_version__ < (0, 12):
 
     # ensure that rally options are registered.
     global_opts.register()
-    global_opts.register_opts(opts.list_opts().items())
+    global_opts.register_opts(opts.list_opts())
 
 __version_info__ = pbr.version.VersionInfo("rally-openstack")
 __version__ = __version_info__.version_string()
diff --git a/rally_openstack/cfg/opts.py b/rally_openstack/cfg/opts.py
index a263c2c7..5dd02cd4 100644
--- a/rally_openstack/cfg/opts.py
+++ b/rally_openstack/cfg/opts.py
@@ -56,4 +56,4 @@ def list_opts():
         for category, opt in l_opts.items():
             opts.setdefault(category, [])
             opts[category].extend(opt)
-    return opts
+    return [(k, v) for k, v in opts.items()]
diff --git a/setup.cfg b/setup.cfg
index 2aed2080..4fd45264 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -33,6 +33,8 @@ setup-hooks =
 rally_plugins =
     path = rally_openstack
     options = rally_openstack.cfg.opts:list_opts
+oslo.config.opts =
+    rally_openstack = rally_openstack.cfg.opts:list_opts
 
 [build_sphinx]
 all_files = 1