Merge "Reuse already existing groups from upstream tempest config"
diff --git a/keystone_tempest_plugin/config.py b/keystone_tempest_plugin/config.py
index 2f3e7e2..87872c5 100644
--- a/keystone_tempest_plugin/config.py
+++ b/keystone_tempest_plugin/config.py
@@ -15,16 +15,7 @@
from oslo_config import cfg
-
-identity_group = cfg.OptGroup(name='identity',
- title="Keystone Configuration Options")
-
-IdentityGroup = []
-
-identity_feature_group = cfg.OptGroup(name='identity-feature-enabled',
- title='Enabled Identity Features')
-
-IdentityFeatureGroup = [
+identity_feature_option = [
cfg.BoolOpt('federation',
default=False,
help='Does the environment support the Federated Identity '
diff --git a/keystone_tempest_plugin/plugin.py b/keystone_tempest_plugin/plugin.py
index 9311409..76f7a9c 100644
--- a/keystone_tempest_plugin/plugin.py
+++ b/keystone_tempest_plugin/plugin.py
@@ -31,17 +31,13 @@
return full_test_dir, base_path
def register_opts(self, conf):
- config.register_opt_group(conf, project_config.identity_group,
- project_config.IdentityGroup)
- config.register_opt_group(conf, project_config.identity_feature_group,
- project_config.IdentityFeatureGroup)
+ config.register_opt_group(conf, config.identity_feature_group,
+ project_config.identity_feature_option)
config.register_opt_group(conf, project_config.fed_scenario_group,
project_config.FedScenarioGroup)
def get_opt_lists(self):
- return [(project_config.identity_group.name,
- project_config.IdentityGroup),
- (project_config.identity_feature_group.name,
- project_config.IdentityFeatureGroup),
+ return [(config.identity_feature_group.name,
+ project_config.identity_feature_option),
(project_config.fed_scenario_group.name,
project_config.FedScenarioGroup)]