create service endpoints in sample data

Enable creation of endpoints by setting ENABLE_ENDPOINTS environment
variable. Works with Catalog SQL backend.

Change-Id: I9ba0ea1b3cf35720fb338e91f48fcbddc326971b

1 files changed, 7 insertions, 1 deletions

diff --git a/keystone/catalog/backends/sql.py b/keystone/catalog/backends/sql.py
index a3a46cda..3fb53167 100644
--- a/keystone/catalog/backends/sql.py
+++ b/keystone/catalog/backends/sql.py
@@ -19,11 +19,15 @@ import sqlalchemy.exc
 import webob.exc
 
 from keystone import catalog
+from keystone import config
 from keystone import exception
 from keystone.common import sql
 from keystone.common.sql import migration
 
 
+CONF = config.CONF
+
+
 class Service(sql.ModelBase, sql.DictBase):
     __tablename__ = 'service'
     id = sql.Column(sql.String(64), primary_key=True)
@@ -140,7 +144,9 @@ class Catalog(sql.Base):
         return [e['id'] for e in list(endpoints)]
 
     def get_catalog(self, user_id, tenant_id, metadata=None):
-        d = {'tenant_id': tenant_id, 'user_id': user_id}
+        d = dict(CONF.iteritems())
+        d.update({'tenant_id': tenant_id,
+                  'user_id': user_id})
         catalog = {}
 
         endpoints = [self.get_endpoint(e)