End of Keystone code update to branch Master and fix some bugs.

Change-Id: Iad3c4f0e6fc78532b92761aa46f2d8508f46a7da

1 files changed, 26 insertions, 0 deletions

diff --git a/keystone-moon/keystone/common/config.py b/keystone-moon/keystone/common/config.py
index 6cc848b4..4966dd9c 100644
--- a/keystone-moon/keystone/common/config.py
+++ b/keystone-moon/keystone/common/config.py
@@ -1138,6 +1138,32 @@ FILE_OPTIONS = {
                     deprecated_for_removal=True,
                     help='Require client certificate.'),
     ],
+    'moon': [
+        cfg.StrOpt('configuration_driver',
+                   default='keystone.contrib.moon.backends.memory.ConfigurationConnector',
+                   help='Configuration backend driver.'),
+        cfg.StrOpt('tenant_driver',
+                   default='keystone.contrib.moon.backends.sql.TenantConnector',
+                   help='Tenant backend driver.'),
+        cfg.StrOpt('authz_driver',
+                   default='keystone.contrib.moon.backends.flat.SuperExtensionConnector',
+                   help='Authorisation backend driver.'),
+        cfg.StrOpt('intraextension_driver',
+                   default='keystone.contrib.moon.backends.sql.IntraExtensionConnector',
+                   help='IntraExtension backend driver.'),
+        cfg.StrOpt('interextension_driver',
+                   default='keystone.contrib.moon.backends.sql.InterExtensionConnector',
+                   help='InterExtension backend driver.'),
+        cfg.StrOpt('log_driver',
+                   default='keystone.contrib.moon.backends.flat.LogConnector',
+                   help='Logs backend driver.'),
+        cfg.StrOpt('policy_directory',
+                   default='/etc/keystone/policies',
+                   help='Local directory where all policies are stored.'),
+        cfg.StrOpt('root_policy_directory',
+                   default='policy_root',
+                   help='Local directory where Root IntraExtension configuration is stored.'),
+    ]
 }