Merge "Use new oslo.config api to generate configuration-group help"
diff --git a/tempest/config.py b/tempest/config.py
index 4fe7163..b062201 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1248,7 +1248,10 @@
generator to discover the options exposed to users.
"""
ext_plugins = plugins.TempestTestPluginManager()
- opt_list = [(getattr(g, 'name', None), o) for g, o in _opts]
+ # Make a shallow copy of the options list that can be
+ # extended by plugins. Send back the group object
+ # to allow group help text to be generated.
+ opt_list = [(g, o) for g, o in _opts]
opt_list.extend(ext_plugins.get_plugin_options_list())
return opt_list