Merge "Remove default override for RBAC config options"
This commit is contained in:
commit
67c9b5e554
@ -32,13 +32,13 @@ CONF = cfg.CONF
|
|||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
# TODO(gmann): Remove setting the default value of config policy_file
|
# TODO(gmann): Remove overriding the default value of config options
|
||||||
# once oslo_policy change the default value to 'policy.yaml'.
|
# 'policy_file' once oslo_policy change its default value to what
|
||||||
# https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d279ab578/oslo_policy/opts.py#L49
|
# is overridden here.
|
||||||
DEFAULT_POLICY_FILE = 'policy.yaml'
|
DEFAULT_POLICY_FILE = 'policy.yaml'
|
||||||
opts.set_defaults(cfg.CONF, DEFAULT_POLICY_FILE,
|
opts.set_defaults(
|
||||||
enforce_scope=True,
|
cfg.CONF,
|
||||||
enforce_new_defaults=True)
|
DEFAULT_POLICY_FILE)
|
||||||
|
|
||||||
# Generic policy check string for system administrators. These are the people
|
# Generic policy check string for system administrators. These are the people
|
||||||
# who need the highest level of authorization to operate the deployment.
|
# who need the highest level of authorization to operate the deployment.
|
||||||
|
@ -19,7 +19,7 @@ oslo.db>=9.1.0 # Apache-2.0
|
|||||||
oslo.rootwrap>=5.8.0 # Apache-2.0
|
oslo.rootwrap>=5.8.0 # Apache-2.0
|
||||||
oslo.log>=4.3.0 # Apache-2.0
|
oslo.log>=4.3.0 # Apache-2.0
|
||||||
oslo.middleware>=3.31.0 # Apache-2.0
|
oslo.middleware>=3.31.0 # Apache-2.0
|
||||||
oslo.policy>=3.7.0 # Apache-2.0
|
oslo.policy>=4.4.0 # Apache-2.0
|
||||||
oslo.serialization>=2.25.0 # Apache-2.0
|
oslo.serialization>=2.25.0 # Apache-2.0
|
||||||
oslo.service>=1.24.0 # Apache-2.0
|
oslo.service>=1.24.0 # Apache-2.0
|
||||||
oslo.upgradecheck>=1.3.0 # Apache-2.0
|
oslo.upgradecheck>=1.3.0 # Apache-2.0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user