From 73742ff84db9f2e72701c16e544dd76d57132328 Mon Sep 17 00:00:00 2001 From: Bin Sun Date: Mon, 26 Mar 2018 14:35:48 +0800 Subject: Hack the python path Since MultiCloud project is not installed explicitly. Hack the python path to make the code work. Change-Id: I2dccb9bc284a0341a8697466022150d83112c47c Issue-ID: MULTICLOUD-150 Signed-off-by: Bin Sun --- multivimbroker/multivimbroker/scripts/api.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'multivimbroker') diff --git a/multivimbroker/multivimbroker/scripts/api.py b/multivimbroker/multivimbroker/scripts/api.py index 01b69a2..b9526d7 100644 --- a/multivimbroker/multivimbroker/scripts/api.py +++ b/multivimbroker/multivimbroker/scripts/api.py @@ -12,9 +12,13 @@ import eventlet eventlet.monkey_patch() +import os # noqa from oslo_config import cfg # noqa from oslo_service import service # noqa import sys # noqa +# FIXME: Since there is no explicitly setup process for the project. Hack the +# python here. +sys.path.append(os.path.abspath('.')) from multivimbroker.api_v2 import service as api_service # noqa -- cgit From 382204d0cc69fcd33f734ff3e172dcb5d5515b6b Mon Sep 17 00:00:00 2001 From: Bin Sun Date: Mon, 26 Mar 2018 14:39:10 +0800 Subject: Add port of api server as configuration Change-Id: Iab43076d7045c64ca11272455562ac37d49491c3 Issue-ID: MULTICLOUD-150 Signed-off-by: Bin Sun --- multivimbroker/multivimbroker/api_v2/service.py | 4 ++-- multivimbroker/multivimbroker/pub/config/config.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'multivimbroker') diff --git a/multivimbroker/multivimbroker/api_v2/service.py b/multivimbroker/multivimbroker/api_v2/service.py index 228cc63..d080068 100644 --- a/multivimbroker/multivimbroker/api_v2/service.py +++ b/multivimbroker/multivimbroker/api_v2/service.py @@ -16,6 +16,7 @@ from oslo_service import service from oslo_service import wsgi from multivimbroker.api_v2 import app +from multivimbroker.pub.config import config as mc_cfg CONF = cfg.CONF @@ -33,9 +34,8 @@ class WSGIService(service.ServiceBase): CONF, "multivimbroker", self.app, - # TODO(xiaohhui): these should be configurable. host="0.0.0.0", - port="9002", + port=mc_cfg.API_SERVER_PORT, use_ssl=False ) diff --git a/multivimbroker/multivimbroker/pub/config/config.py b/multivimbroker/multivimbroker/pub/config/config.py index 192c743..727b0cc 100644 --- a/multivimbroker/multivimbroker/pub/config/config.py +++ b/multivimbroker/multivimbroker/pub/config/config.py @@ -36,3 +36,6 @@ FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST", # [IMAGE LOCAL PATH] ROOT_PATH = os.path.dirname( os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) + +# [Local Config] +API_SERVER_PORT = 9001 -- cgit