Merge "Remove default override for config options policy_file"
This commit is contained in:
commit
736cfd3a81
@ -22,7 +22,6 @@ from oslo_concurrency import lockutils
|
|||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
from oslo_log import versionutils
|
from oslo_log import versionutils
|
||||||
from oslo_policy import opts
|
|
||||||
from oslo_policy import policy
|
from oslo_policy import policy
|
||||||
|
|
||||||
from ironic.common import exception
|
from ironic.common import exception
|
||||||
@ -32,14 +31,6 @@ CONF = cfg.CONF
|
|||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
# TODO(gmann): Remove overriding the default value of config options
|
|
||||||
# 'policy_file' once oslo_policy change its default value to what
|
|
||||||
# is overridden here.
|
|
||||||
DEFAULT_POLICY_FILE = 'policy.yaml'
|
|
||||||
opts.set_defaults(
|
|
||||||
cfg.CONF,
|
|
||||||
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.
|
||||||
# They're allowed to create, read, update, or delete any system-specific
|
# They're allowed to create, read, update, or delete any system-specific
|
||||||
|
@ -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>=4.4.0 # Apache-2.0
|
oslo.policy>=4.5.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