Renamed service API configuration options
This commit is contained in:
parent
aff79a3695
commit
96c288e985
@ -69,12 +69,12 @@ if __name__ == '__main__':
|
||||
config_file = config.find_config_file(options, args)
|
||||
print "Using config file:", config_file
|
||||
|
||||
# Load Public API server
|
||||
# Load Service API server
|
||||
server = wsgi.Server()
|
||||
server.start(app, int(conf['public_port']), conf['public_host'])
|
||||
server.start(app, int(conf['service_port']), conf['service_host'])
|
||||
|
||||
print "Service API listening on %s:%s" % (
|
||||
conf['public_host'], conf['public_port'])
|
||||
conf['service_host'], conf['service_port'])
|
||||
|
||||
# Load Admin API server
|
||||
admin_server = wsgi.Server()
|
||||
|
@ -63,10 +63,10 @@ if __name__ == '__main__':
|
||||
print "Using config file:", config_file
|
||||
|
||||
server = wsgi.Server()
|
||||
server.start(app, int(conf['public_port']), conf['public_host'])
|
||||
server.start(app, int(conf['service_port']), conf['service_host'])
|
||||
|
||||
print "Service API listening on %s:%s" % (
|
||||
conf['public_host'], conf['public_port'])
|
||||
conf['service_host'], conf['service_port'])
|
||||
|
||||
server.wait()
|
||||
except RuntimeError, e:
|
||||
|
@ -26,10 +26,10 @@ service-header-mappings = {
|
||||
|
||||
# Address to bind the API server
|
||||
# TODO Properties defined within app not available via pipeline.
|
||||
public_host = 0.0.0.0
|
||||
service_host = 0.0.0.0
|
||||
|
||||
# Port the bind the API server to
|
||||
public_port = 5000
|
||||
service_port = 5000
|
||||
|
||||
# Address to bind the Admin API server
|
||||
admin_host = 0.0.0.0
|
||||
@ -65,18 +65,18 @@ sql_idle_timeout = 30
|
||||
[pipeline:admin]
|
||||
pipeline =
|
||||
urlrewritefilter
|
||||
admin_service
|
||||
admin_api
|
||||
|
||||
[pipeline:keystone-legacy-auth]
|
||||
pipeline =
|
||||
urlrewritefilter
|
||||
legacy_auth
|
||||
public_service
|
||||
service_api
|
||||
|
||||
[app:public_service]
|
||||
paste.app_factory = keystone.server:app_factory
|
||||
[app:service_api]
|
||||
paste.app_factory = keystone.server:service_app_factory
|
||||
|
||||
[app:admin_service]
|
||||
[app:admin_api]
|
||||
paste.app_factory = keystone.server:admin_app_factory
|
||||
|
||||
[filter:urlrewritefilter]
|
||||
|
@ -8,7 +8,7 @@ from keystone.controllers.version import VersionController
|
||||
from keystone.controllers.staticfiles import StaticFilesController
|
||||
|
||||
class ServiceApi(wsgi.Router):
|
||||
"""WSGI entry point for public Keystone API requests."""
|
||||
"""WSGI entry point for Keystone Service API requests."""
|
||||
|
||||
def __init__(self, options):
|
||||
self.options = options
|
||||
|
@ -39,7 +39,7 @@ from keystone.backends import alterdb, sqlalchemy #@UnusedImport (?)
|
||||
from keystone.routers.service import ServiceApi
|
||||
from keystone.routers.admin import AdminApi
|
||||
|
||||
def app_factory(global_conf, **local_conf):
|
||||
def service_app_factory(global_conf, **local_conf):
|
||||
"""paste.deploy app factory for creating OpenStack API server apps"""
|
||||
try:
|
||||
conf = global_conf.copy()
|
||||
|
Loading…
Reference in New Issue
Block a user