From 0fe9663a267283c5ba654f96c709ba63bca29907 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sat, 15 Oct 2022 20:18:58 -0500 Subject: [PATCH] Clarify the enforce_scope config option help message enforce_scope config option enable enforce_scope as well as the enforce_new_defaults config options of services. We need to mention the same in tempest config option help message also. Change-Id: I733947a569b5767a1a669d7e949d65837d77b859 --- tempest/config.py | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/tempest/config.py b/tempest/config.py index 39e7fb3827..37288dd374 100644 --- a/tempest/config.py +++ b/tempest/config.py @@ -1242,29 +1242,39 @@ enforce_scope_group = cfg.OptGroup(name="enforce_scope", EnforceScopeGroup = [ cfg.BoolOpt('nova', default=False, - help='Does the compute service API policies enforce scope? ' - 'This configuration value should be same as ' - 'nova.conf: [oslo_policy].enforce_scope option.'), + help='Does the compute service API policies enforce scope and ' + 'new defaults? This configuration value should be ' + 'enabled when nova.conf: [oslo_policy]. ' + 'enforce_new_defaults and nova.conf: [oslo_policy]. ' + 'enforce_scope options are enabled in nova conf.'), cfg.BoolOpt('neutron', default=False, - help='Does the network service API policies enforce scope? ' - 'This configuration value should be same as ' - 'neutron.conf: [oslo_policy].enforce_scope option.'), + help='Does the network service API policies enforce scope and ' + 'new defaults? This configuration value should be ' + 'enabled when neutron.conf: [oslo_policy]. ' + 'enforce_new_defaults and neutron.conf: [oslo_policy]. ' + 'enforce_scope options are enabled in neutron conf.'), cfg.BoolOpt('glance', default=False, - help='Does the Image service API policies enforce scope? ' - 'This configuration value should be same as ' - 'glance.conf: [oslo_policy].enforce_scope option.'), + help='Does the Image service API policies enforce scope and ' + 'new defaults? This configuration value should be ' + 'enabled when glance.conf: [oslo_policy]. ' + 'enforce_new_defaults and glance.conf: [oslo_policy]. ' + 'enforce_scope options are enabled in glance conf.'), cfg.BoolOpt('cinder', default=False, - help='Does the Volume service API policies enforce scope? ' - 'This configuration value should be same as ' - 'cinder.conf: [oslo_policy].enforce_scope option.'), + help='Does the Volume service API policies enforce scope and ' + 'new defaults? This configuration value should be ' + 'enabled when cinder.conf: [oslo_policy]. ' + 'enforce_new_defaults and cinder.conf: [oslo_policy]. ' + 'enforce_scope options are enabled in cinder conf.'), cfg.BoolOpt('keystone', default=False, - help='Does the Identity service API policies enforce scope? ' - 'This configuration value should be same as ' - 'keystone.conf: [oslo_policy].enforce_scope option.'), + help='Does the Identity service API policies enforce scope ' + 'and new defaults? This configuration value should be ' + 'enabled when keystone.conf: [oslo_policy]. ' + 'enforce_new_defaults and keystone.conf: [oslo_policy]. ' + 'enforce_scope options are enabled in keystone conf.'), ] debug_group = cfg.OptGroup(name="debug",