Merge "Set objects indirection API in metadata service"

This commit is contained in:
Jenkins
2014-01-19 06:24:44 +00:00
committed by Gerrit Code Review

View File

@@ -22,7 +22,9 @@ import sys
from oslo.config import cfg
from nova.conductor import rpcapi as conductor_rpcapi
from nova import config
from nova.objects import base as objects_base
from nova.openstack.common import log as logging
from nova import service
from nova import utils
@@ -30,12 +32,18 @@ from nova import utils
CONF = cfg.CONF
CONF.import_opt('enabled_ssl_apis', 'nova.service')
CONF.import_opt('use_local', 'nova.conductor.api', group='conductor')
def main():
config.parse_args(sys.argv)
logging.setup("nova")
utils.monkey_patch()
if not CONF.conductor.use_local:
objects_base.NovaObject.indirection_api = \
conductor_rpcapi.ConductorAPI()
should_use_ssl = 'metadata' in CONF.enabled_ssl_apis
server = service.WSGIService('metadata', use_ssl=should_use_ssl)
service.serve(server, workers=server.workers)