diff options
Diffstat (limited to 'keystone/catalog')
| -rw-r--r-- | keystone/catalog/backends/sql.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/keystone/catalog/backends/sql.py b/keystone/catalog/backends/sql.py index ed78d010..3c553e0c 100644 --- a/keystone/catalog/backends/sql.py +++ b/keystone/catalog/backends/sql.py @@ -38,7 +38,7 @@ class Service(sql.ModelBase, sql.DictBase): def from_dict(cls, service_dict): extra = {} for k, v in service_dict.copy().iteritems(): - if k not in ['id', 'type']: + if k not in ['id', 'type', 'extra']: extra[k] = service_dict.pop(k) service_dict['extra'] = extra @@ -64,7 +64,7 @@ class Endpoint(sql.ModelBase, sql.DictBase): def from_dict(cls, endpoint_dict): extra = {} for k, v in endpoint_dict.copy().iteritems(): - if k not in ['id', 'region', 'service_id']: + if k not in ['id', 'region', 'service_id', 'extra']: extra[k] = endpoint_dict.pop(k) endpoint_dict['extra'] = extra return cls(**endpoint_dict) |