policy.py (solum-9.0.0) | : | policy.py (solum-10.0.0) | ||
---|---|---|---|---|
skipping to change at line 17 | skipping to change at line 17 | |||
# Unless required by applicable law or agreed to in writing, software | # Unless required by applicable law or agreed to in writing, software | |||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | |||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | |||
# License for the specific language governing permissions and limitations | # License for the specific language governing permissions and limitations | |||
# under the License. | # under the License. | |||
# Based on designate/policy.py | # Based on designate/policy.py | |||
from oslo_config import cfg | from oslo_config import cfg | |||
from oslo_log import log as logging | from oslo_log import log as logging | |||
from oslo_policy import opts | ||||
from oslo_policy import policy | from oslo_policy import policy | |||
from webob import exc as exceptions | from webob import exc as exceptions | |||
from solum.common import policies | from solum.common import policies | |||
LOG = logging.getLogger(__name__) | LOG = logging.getLogger(__name__) | |||
CONF = cfg.CONF | CONF = cfg.CONF | |||
# TODO(gmann): Remove setting the default value of config policy_file | ||||
# once oslo_policy change the default value to 'policy.yaml'. | ||||
# https://github.com/openstack/oslo.policy/blob/a626ad12fe5a3abd49d70e3e5b95589d | ||||
279ab578/oslo_policy/opts.py#L49 | ||||
DEFAULT_POLICY_FILE = 'policy.yaml' | ||||
opts.set_defaults(CONF, DEFAULT_POLICY_FILE) | ||||
_ENFORCER = None | _ENFORCER = None | |||
def reset(): | def reset(): | |||
global _ENFORCER | global _ENFORCER | |||
if _ENFORCER: | if _ENFORCER: | |||
_ENFORCER.clear() | _ENFORCER.clear() | |||
_ENFORCER = None | _ENFORCER = None | |||
def init(use_conf=True): | def init(use_conf=True): | |||
global _ENFORCER | global _ENFORCER | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 8 lines changed or added |