Move Keystone config to main designate config

The keystone middleware can be configured using the main designate
config file. This allows the api-paste config file to be left as is
by most designate users.

Bug #1206091

Change-Id: I6b0be7dbdecdecd5579b3024b59d8a070205fc1e

.gitignore

@@ -13,7 +13,6 @@ venv
 *.sqlite
 var/*
 etc/designate/*.conf
-etc/designate/*.ini
 AUTHORS
 ChangeLog
 doc/source/api/*

designate/tests/__init__.py

@@ -110,7 +110,6 @@ class TestCase(unittest2.TestCase):
 
         self.config(
             auth_strategy='noauth',
-            api_paste_config='api-paste.ini.sample',
             group='service:api'
         )
 

etc/designate/api-paste.ini

@@ -28,12 +28,3 @@ paste.filter_factory = designate.api.middleware:KeystoneContextMiddleware.factor
 
 [filter:authtoken]
 paste.filter_factory = keystoneclient.middleware.auth_token:filter_factory
-service_protocol = http
-service_host = 127.0.0.1
-service_port = 5000
-auth_host = 127.0.0.1
-auth_port = 35357
-auth_protocol = http
-admin_tenant_name = %SERVICE_TENANT_NAME%
-admin_user = %SERVICE_USER%
-admin_password = %SERVICE_PASSWORD%

etc/designate/designate.conf.sample

@@ -60,6 +60,17 @@ root_helper = sudo
 # Enabled API Version 1 extensions
 #enabled_extensions_v1 = diagnostics, quotas, reports, sync
 
+#-----------------------
+# Keystone Middleware
+#-----------------------
+[keystone_authtoken]
+#auth_host = 127.0.0.1
+#auth_port = 35357
+#auth_protocol = http
+#admin_tenant_name = service
+#admin_user = designate
+#admin_password = designate
+
 #-----------------------
 # Agent Service
 #-----------------------