diff options
| author | Zuul <zuul@review.opendev.org> | 2020-04-22 11:06:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-04-22 11:06:04 +0000 |
| commit | c908edb2dbcce4f09134a6bbf2a1eb706f808d82 (patch) | |
| tree | 8e43a01f8d3d5de3e8caac475e446ad461881a86 | |
| parent | 99cffd54cf6dd47b0fd7fd26c2d65db9d490e209 (diff) | |
| parent | ba8dd06e123adb353c5bb71d75c345cf3e463ba8 (diff) | |
| download | keystone-c908edb2dbcce4f09134a6bbf2a1eb706f808d82.tar.gz | |
Merge "Parse cli args in get_enforcer"
| -rw-r--r-- | keystone/common/rbac_enforcer/policy.py | 7 | ||||
| -rw-r--r-- | lower-constraints.txt | 2 | ||||
| -rw-r--r-- | requirements.txt | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/keystone/common/rbac_enforcer/policy.py b/keystone/common/rbac_enforcer/policy.py index 52cc86c36..e91be020c 100644 --- a/keystone/common/rbac_enforcer/policy.py +++ b/keystone/common/rbac_enforcer/policy.py @@ -35,12 +35,7 @@ def get_enforcer(): :returns: :class:`oslo_policy.policy.Enforcer` """ - # Here we pass an empty list of arguments because there aren't any - # arguments that oslo.config or oslo.policy shouldn't already understand - # from the CONF object. This makes things easier here because we don't have - # to parse arguments passed in from the command line and remove unexpected - # arguments before building a Config object. - CONF([], project='keystone') + CONF(project='keystone') return _ENFORCER._enforcer diff --git a/lower-constraints.txt b/lower-constraints.txt index ebf5799a9..9404d82f7 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -34,7 +34,7 @@ oslo.i18n==3.15.3 oslo.log==3.44.0 oslo.messaging==5.29.0 oslo.middleware==3.31.0 -oslo.policy==2.3.0 +oslo.policy==3.0.2 oslo.serialization==2.18.0 oslo.upgradecheck==0.1.0 oslo.utils==3.33.0 diff --git a/requirements.txt b/requirements.txt index 12d3c297f..2fa9509f8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ oslo.db>=4.27.0 # Apache-2.0 oslo.i18n>=3.15.3 # Apache-2.0 oslo.log>=3.44.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 -oslo.policy>=2.3.0 # Apache-2.0 +oslo.policy>=3.0.2 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.upgradecheck>=0.1.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 |