move everything over to the default config
This commit is contained in:
termie
parent
feadf75760
commit
0f6a9a78d9
|
|
@ -37,6 +37,9 @@ paste.filter_factory = keystonelight.middleware:AdminTokenAuthMiddleware.factory
|
|||
[filter:json_body]
|
||||
paste.filter_factory = keystonelight.middleware:JsonBodyMiddleware.factory
|
||||
|
||||
[filter:crud_extension]
|
||||
paste.filter_factory = keystonelight.keystone_compat:KeystoneAdminCrudExtension.factory
|
||||
|
||||
[app:keystonelight]
|
||||
paste.app_factory = keystonelight.service:app_factory
|
||||
|
||||
|
|
@ -53,9 +56,13 @@ pipeline = token_auth admin_token_auth json_body debug keystonelight
|
|||
pipeline = token_auth admin_token_auth json_body debug keystone_service
|
||||
|
||||
[pipeline:keystone_admin_api]
|
||||
pipeline = token_auth admin_token_auth json_body debug keystone_admin
|
||||
pipeline = token_auth admin_token_auth json_body debug crud_extension keystone_admin
|
||||
|
||||
[composite:main]
|
||||
use = egg:Paste#urlmap
|
||||
/ = keystonelight_api
|
||||
/v2.0 = keystone_service_api
|
||||
|
||||
[composite:admin]
|
||||
use = egg:Paste#urlmap
|
||||
/v2.0 = keystone_admin_api
|
||||
|
|
|
|||
|
|
@ -1,67 +0,0 @@
|
|||
[DEFAULT]
|
||||
public_port = 5000
|
||||
admin_port = 35357
|
||||
admin_token = ADMIN
|
||||
|
||||
[sql]
|
||||
connection = sqlite:///bla.db
|
||||
idle_timeout = 200
|
||||
min_pool_size = 5
|
||||
max_pool_size = 10
|
||||
pool_timeout = 200
|
||||
|
||||
[identity]
|
||||
driver = keystonelight.backends.kvs.KvsIdentity
|
||||
|
||||
[catalog]
|
||||
driver = keystonelight.backends.templated.TemplatedCatalog
|
||||
template_file = default_catalog.templates
|
||||
|
||||
[token]
|
||||
driver = keystonelight.backends.kvs.KvsToken
|
||||
|
||||
[policy]
|
||||
driver = keystonelight.backends.policy.SimpleMatch
|
||||
|
||||
|
||||
[filter:debug]
|
||||
paste.filter_factory = keystonelight.wsgi:Debug.factory
|
||||
|
||||
[filter:token_auth]
|
||||
paste.filter_factory = keystonelight.middleware:TokenAuthMiddleware.factory
|
||||
|
||||
[filter:admin_token_auth]
|
||||
paste.filter_factory = keystonelight.middleware:AdminTokenAuthMiddleware.factory
|
||||
|
||||
[filter:json_body]
|
||||
paste.filter_factory = keystonelight.middleware:JsonBodyMiddleware.factory
|
||||
|
||||
[filter:crud_extension]
|
||||
paste.filter_factory = keystonelight.keystone_compat:KeystoneAdminCrudExtension.factory
|
||||
|
||||
[app:keystonelight]
|
||||
paste.app_factory = keystonelight.service:app_factory
|
||||
|
||||
[app:keystone_service]
|
||||
paste.app_factory = keystonelight.keystone_compat:service_app_factory
|
||||
|
||||
[app:keystone_admin]
|
||||
paste.app_factory = keystonelight.keystone_compat:admin_app_factory
|
||||
|
||||
[pipeline:keystonelight_api]
|
||||
pipeline = token_auth admin_token_auth json_body debug keystonelight
|
||||
|
||||
[pipeline:keystone_service_api]
|
||||
pipeline = token_auth admin_token_auth json_body debug keystone_service
|
||||
|
||||
[pipeline:keystone_admin_api]
|
||||
pipeline = token_auth admin_token_auth json_body debug crud_extension keystone_admin
|
||||
|
||||
[composite:main]
|
||||
use = egg:Paste#urlmap
|
||||
/ = keystonelight_api
|
||||
/v2.0 = keystone_service_api
|
||||
|
||||
[composite:admin]
|
||||
use = egg:Paste#urlmap
|
||||
/v2.0 = keystone_admin_api
|
||||
|
|
@ -1,3 +1,4 @@
|
|||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
from keystonelight import config
|
||||
from keystonelight import test
|
||||
|
||||
|
|
@ -42,19 +43,15 @@ class MasterCompatTestCase(CompatTestCase):
|
|||
from keystoneclient.v2_0 import client as ks_client
|
||||
reload(ks_client)
|
||||
|
||||
CONF(config_files=['keystoneclient_compat_master.conf'])
|
||||
self.public_app = self.loadapp('keystoneclient_compat_master',
|
||||
name='main')
|
||||
self.admin_app = self.loadapp('keystoneclient_compat_master',
|
||||
name='admin')
|
||||
self._config()
|
||||
self.public_app = self.loadapp('default', name='main')
|
||||
self.admin_app = self.loadapp('default', name='admin')
|
||||
|
||||
self.load_backends()
|
||||
self.load_fixtures(default_fixtures)
|
||||
|
||||
self.public_server = self.serveapp('keystoneclient_compat_master',
|
||||
name='main')
|
||||
self.admin_server = self.serveapp('keystoneclient_compat_master',
|
||||
name='admin')
|
||||
self.public_server = self.serveapp('default', name='main')
|
||||
self.admin_server = self.serveapp('default', name='admin')
|
||||
|
||||
# TODO(termie): is_admin is being deprecated once the policy stuff
|
||||
# is all working
|
||||
|
|
@ -64,6 +61,10 @@ class MasterCompatTestCase(CompatTestCase):
|
|||
self.user_foo['id'], self.tenant_bar['id'],
|
||||
dict(roles=['keystone_admin'], is_admin='1'))
|
||||
|
||||
def _config(self):
|
||||
CONF(config_files=['default.conf'])
|
||||
|
||||
|
||||
def foo_client(self):
|
||||
return self._client(username='FOO',
|
||||
password='foo2',
|
||||
|
|
|
|||
|
|
@ -32,11 +32,11 @@ class NovaClientCompatMasterTestCase(CompatTestCase):
|
|||
reload(ks_client)
|
||||
reload(base_client)
|
||||
|
||||
CONF(config_files=['keystoneclient_compat_master.conf'])
|
||||
self.app = self.loadapp('keystoneclient_compat_master')
|
||||
CONF(config_files=['default.conf'])
|
||||
self.app = self.loadapp('default')
|
||||
self.load_backends()
|
||||
self.load_fixtures(default_fixtures)
|
||||
self.server = self.serveapp('keystoneclient_compat_master')
|
||||
self.server = self.serveapp('default')
|
||||
|
||||
def test_authenticate_and_tenants(self):
|
||||
from novaclient.keystone import client as ks_client
|
||||
|
|
|
|||
Loading…
Reference in New Issue