commit e98edbd16317a6835aca05a12d4d148de96b66c5
author Martin Polreich <polreichmartin@gmail.com> Mon Nov 25 16:09:24 2019 +0100
committer Denis Egorenko <degorenko@mirantis.com> Wed Dec 04 13:37:36 2019 +0000
tree 4e08d9b0929434a3753e0b8048498678e5f648a2
parent f8f3c80a57386fd2896cdc6ff2a3435844d4cb86

Add keystone_policy.export_policy_grains state

	- Allows expoting policy rules from file to grains

Related: PROD-34126

Change-Id: I4ac488aa740e97e479e29991d991f7bb8b8e349e

_modules/keystone_policy.py

diff --git a/_modules/keystone_policy.py b/_modules/keystone_policy.py
index f3cf8ee..9c4a5ef 100644
--- a/_modules/keystone_policy.py
+++ b/_modules/keystone_policy.py
@@ -58,10 +58,13 @@
     return True
 
 
-def rule_list(path, **kwargs):
+def rule_list(path, ordered_dict = True, **kwargs):
     try:
         with io.open(path, 'r') as file_handle:
-            rules = yaml.load(file_handle, OrderedDictYAMLLoader) or OrderedDict()
+            if ordered_dict:
+                rules = yaml.load(file_handle, OrderedDictYAMLLoader) or OrderedDict()
+            else:
+                rules = yaml.safe_load(file_handle) or {}
     except Exception as e:
         msg = "Unable to load policy file %s: %s" % (path, repr(e))
         LOG.debug(msg)