openstack/nova
Code Issues Proposed changes

Merge "Revert "Enable options for oslo.reports""

Browse Source
This commit is contained in:
Jenkins 2015-12-17 23:48:03 +00:00 committed by Gerrit Code Review
commit 317f474c6d
18 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/nova/nova-config-generator.conf
View File

@ -13,7 +13,6 @@ namespace = nova.openstack.common.memorycache
namespace = oslo.log
namespace = oslo.messaging
namespace = oslo.policy
namespace = oslo.reports
namespace = oslo.service.periodic_task
namespace = oslo.service.service
namespace = oslo.service.sslutils

4
nova/cmd/api.py
View File

@ -24,11 +24,13 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
CONF.import_opt('enabled_apis', 'nova.service')
@ -41,6 +43,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
launcher = service.process_launcher()
for api in CONF.enabled_apis:
should_use_ssl = api in CONF.enabled_ssl_apis

4
nova/cmd/api_ec2.py
View File

@ -20,11 +20,13 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
@ -37,6 +39,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
should_use_ssl = 'ec2' in CONF.enabled_ssl_apis
server = service.WSGIService('ec2', use_ssl=should_use_ssl,
max_url_len=16384)

4
nova/cmd/api_metadata.py
View File

@ -20,6 +20,7 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova.conductor import rpcapi as conductor_rpcapi
from nova import config
@ -27,6 +28,7 @@ from nova import objects
from nova.objects import base as objects_base
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
@ -40,6 +42,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
if not CONF.conductor.use_local:
objects_base.NovaObject.indirection_api = \
conductor_rpcapi.ConductorAPI()

4
nova/cmd/api_os_compute.py
View File

@ -20,11 +20,13 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
@ -37,6 +39,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
should_use_ssl = 'osapi_compute' in CONF.enabled_ssl_apis
server = service.WSGIService('osapi_compute', use_ssl=should_use_ssl)
service.serve(server, workers=server.workers)

4
nova/cmd/baseproxy.py
View File

@ -22,8 +22,10 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova.console import websocketproxy
from nova import version
CONF = cfg.CONF
@ -52,6 +54,8 @@ def proxy(host, port):
logging.setup(CONF, "nova")
gmr.TextGuruMeditation.setup_autorun(version)
# Create and start the NovaWebSockets proxy
websocketproxy.NovaWebSocketProxy(
listen_host=host,

4
nova/cmd/cells.py
View File

@ -19,11 +19,13 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
CONF.import_opt('topic', 'nova.cells.opts', group='cells')
@ -36,6 +38,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
server = service.Service.create(binary='nova-cells',
topic=CONF.cells.topic,
manager=CONF.cells.manager)

4
nova/cmd/cert.py
View File

@ -18,11 +18,13 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
CONF.import_opt('cert_topic', 'nova.cert.rpcapi')
@ -34,6 +36,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
server = service.Service.create(binary='nova-cert', topic=CONF.cert_topic)
service.serve(server)
service.wait()

4
nova/cmd/compute.py
View File

@ -21,6 +21,7 @@ import traceback
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova.conductor import rpcapi as conductor_rpcapi
from nova import config
@ -31,6 +32,7 @@ from nova import objects
from nova.objects import base as objects_base
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
CONF.import_opt('compute_topic', 'nova.compute.rpcapi')
@ -58,6 +60,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
if not CONF.conductor.use_local:
block_db_access()
objects_base.NovaObject.indirection_api = \

4
nova/cmd/conductor.py
View File

@ -19,11 +19,13 @@ import sys
from oslo_concurrency import processutils
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
CONF.import_opt('topic', 'nova.conductor.api', group='conductor')
@ -35,6 +37,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
server = service.Service.create(binary='nova-conductor',
topic=CONF.conductor.topic,
manager=CONF.conductor.manager)

4
nova/cmd/console.py
View File

@ -19,10 +19,12 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import version
CONF = cfg.CONF
CONF.import_opt('console_topic', 'nova.console.rpcapi')
@ -33,6 +35,8 @@ def main():
logging.setup(CONF, "nova")
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
server = service.Service.create(binary='nova-console',
topic=CONF.console_topic)
service.serve(server)

4
nova/cmd/consoleauth.py
View File

@ -19,10 +19,12 @@ import sys
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import objects
from nova import service
from nova import version
CONF = cfg.CONF
@ -34,6 +36,8 @@ def main():
logging.setup(CONF, "nova")
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
server = service.Service.create(binary='nova-consoleauth',
topic=CONF.consoleauth_topic)
service.serve(server)

4
nova/cmd/network.py
View File

@ -21,6 +21,7 @@ import traceback
from oslo_config import cfg
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova.conductor import rpcapi as conductor_rpcapi
from nova import config
@ -31,6 +32,7 @@ from nova import objects
from nova.objects import base as objects_base
from nova import service
from nova import utils
from nova import version
CONF = cfg.CONF
CONF.import_opt('network_topic', 'nova.network.rpcapi')
@ -58,6 +60,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
if not CONF.conductor.use_local:
block_db_access()
objects_base.NovaObject.indirection_api = \

4
nova/cmd/objectstore.py
View File

@ -20,11 +20,13 @@
import sys
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova.objectstore import s3server
from nova import service
from nova import utils
from nova import version
def main():
@ -32,6 +34,8 @@ def main():
logging.setup(config.CONF, "nova")
utils.monkey_patch()
gmr.TextGuruMeditation.setup_autorun(version)
server = s3server.get_wsgi_server()
service.serve(server)
service.wait()

4
nova/cmd/scheduler.py
View File

@ -19,12 +19,14 @@
import sys
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
import nova.conf
from nova import config
from nova import objects
from nova import service
from nova import utils
from nova import version
CONF = nova.conf.CONF
@ -35,6 +37,8 @@ def main():
utils.monkey_patch()
objects.register_all()
gmr.TextGuruMeditation.setup_autorun(version)
server = service.Service.create(binary='nova-scheduler',
topic=CONF.scheduler_topic)
service.serve(server)

4
nova/cmd/xvpvncproxy.py
View File

@ -18,9 +18,11 @@
import sys
from oslo_log import log as logging
from oslo_reports import guru_meditation_report as gmr
from nova import config
from nova import service
from nova import version
from nova.vnc import xvp_proxy
@ -28,6 +30,8 @@ def main():
config.parse_args(sys.argv)
logging.setup(config.CONF, "nova")
gmr.TextGuruMeditation.setup_autorun(version)
wsgi_server = xvp_proxy.get_wsgi_server()
service.serve(wsgi_server)
service.wait()

5
nova/config.py
View File

@ -18,9 +18,6 @@
from oslo_config import cfg
from oslo_db import options
from oslo_log import log
from oslo_reports import guru_meditation_report as gmr
from oslo_reports import opts as gmr_opts
from nova.db.sqlalchemy import api as sqlalchemy_api
from nova import debugger
@ -53,7 +50,6 @@ _DEFAULT_LOGGING_CONTEXT_FORMAT = ('%(asctime)s.%(msecs)03d %(process)d '
def parse_args(argv, default_config_files=None, configure_db=True):
log.set_defaults(_DEFAULT_LOGGING_CONTEXT_FORMAT, _DEFAULT_LOG_LEVELS)
log.register_options(CONF)
gmr_opts.set_defaults(CONF)
options.set_defaults(CONF, connection=_DEFAULT_SQL_CONNECTION,
sqlite_db='nova.sqlite')
rpc.set_defaults(control_exchange='nova')
@ -62,7 +58,6 @@ def parse_args(argv, default_config_files=None, configure_db=True):
project='nova',
version=version.version_string(),
default_config_files=default_config_files)
gmr.TextGuruMeditation.setup_autorun(version, conf=CONF)
rpc.init(CONF)
if configure_db:

6
releasenotes/notes/new-oslo-reports-option-619c3dbf3ae320fb.yaml
View File

@ -1,6 +0,0 @@
---
features:
- You can now specify a directory for generating GMR logs
by adding a "log_dir" key under the "[oslo_report]" section in
nova.conf. If you do not specify this option, you will see the GMR
output in Nova logs.