From 92d11d139e9f76d4fd76859aea78643fc32ef36b Mon Sep 17 00:00:00 2001 From: asteroide Date: Thu, 24 Sep 2015 16:27:16 +0200 Subject: Update Keystone code from repository. Change-Id: Ib3d0a06b10902fcc6d520f58e85aa617bc326d00 --- keystone-moon/keystone/catalog/backends/kvs.py | 2 +- keystone-moon/keystone/catalog/backends/sql.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keystone-moon/keystone/catalog/backends') diff --git a/keystone-moon/keystone/catalog/backends/kvs.py b/keystone-moon/keystone/catalog/backends/kvs.py index 30a121d8..fe975d9d 100644 --- a/keystone-moon/keystone/catalog/backends/kvs.py +++ b/keystone-moon/keystone/catalog/backends/kvs.py @@ -18,7 +18,7 @@ from keystone.common import driver_hints from keystone.common import kvs -class Catalog(kvs.Base, catalog.Driver): +class Catalog(kvs.Base, catalog.CatalogDriverV8): # Public interface def get_catalog(self, user_id, tenant_id): return self.db.get('catalog-%s-%s' % (tenant_id, user_id)) diff --git a/keystone-moon/keystone/catalog/backends/sql.py b/keystone-moon/keystone/catalog/backends/sql.py index 0db6d498..fe69db58 100644 --- a/keystone-moon/keystone/catalog/backends/sql.py +++ b/keystone-moon/keystone/catalog/backends/sql.py @@ -86,7 +86,7 @@ class Endpoint(sql.ModelBase, sql.DictBase): extra = sql.Column(sql.JsonBlob()) -class Catalog(catalog.Driver): +class Catalog(catalog.CatalogDriverV8): # Regions def list_regions(self, hints): session = sql.get_session() -- cgit 1.2.3-korg