aboutsummaryrefslogtreecommitdiffstats
path: root/keystone-moon/keystone/resource/backends
diff options
context:
space:
mode:
authorasteroide <thomas.duval@orange.com>2015-09-24 16:27:16 +0200
committerasteroide <thomas.duval@orange.com>2015-09-24 16:27:16 +0200
commit92d11d139e9f76d4fd76859aea78643fc32ef36b (patch)
treebd5a2e7b50853498074ab55bdaee4452c460010b /keystone-moon/keystone/resource/backends
parent49325d99acfadaadfad99c596c4ada6b5ec849de (diff)
Update Keystone code from repository.
Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00
Diffstat (limited to 'keystone-moon/keystone/resource/backends')
-rw-r--r--keystone-moon/keystone/resource/backends/ldap.py7
-rw-r--r--keystone-moon/keystone/resource/backends/sql.py2
2 files changed, 7 insertions, 2 deletions
diff --git a/keystone-moon/keystone/resource/backends/ldap.py b/keystone-moon/keystone/resource/backends/ldap.py
index 43684035..566adc5d 100644
--- a/keystone-moon/keystone/resource/backends/ldap.py
+++ b/keystone-moon/keystone/resource/backends/ldap.py
@@ -16,6 +16,7 @@ import uuid
from oslo_config import cfg
from oslo_log import log
+from oslo_log import versionutils
from keystone.common import clean
from keystone.common import driver_hints
@@ -31,7 +32,11 @@ CONF = cfg.CONF
LOG = log.getLogger(__name__)
-class Resource(resource.Driver):
+class Resource(resource.ResourceDriverV8):
+ @versionutils.deprecated(
+ versionutils.deprecated.LIBERTY,
+ remove_in=+1,
+ what='ldap resource')
def __init__(self):
super(Resource, self).__init__()
self.LDAP_URL = CONF.ldap.url
diff --git a/keystone-moon/keystone/resource/backends/sql.py b/keystone-moon/keystone/resource/backends/sql.py
index 3a0d8cea..59bab372 100644
--- a/keystone-moon/keystone/resource/backends/sql.py
+++ b/keystone-moon/keystone/resource/backends/sql.py
@@ -24,7 +24,7 @@ CONF = cfg.CONF
LOG = log.getLogger(__name__)
-class Resource(keystone_resource.Driver):
+class Resource(keystone_resource.ResourceDriverV8):
def default_assignment_driver(self):
return 'sql'