Remove deprecated nova-all binary
This was deprecated and to set to be removed in Ocata. It was only intended for testing purposes and not for production use. Individual binaries will be used instead. Change-Id: I260962ec7c4167b07e9480a04454a9cb5666f8ed
This commit is contained in:
Mike Perez
parent
ddbbf57827
commit
c07c0d4b8e
@ -113,8 +113,6 @@ modindex_common_prefix = ['nova.']
|
||||
# List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'
|
||||
|
||||
man_pages = [
|
||||
('man/nova-all', 'nova-all', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-api-metadata', 'nova-api-metadata', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-api-os-compute', 'nova-api-os-compute',
|
||||
|
||||
@ -25,7 +25,6 @@ Reference
|
||||
.. toctree::
|
||||
:maxdepth: 1
|
||||
|
||||
nova-all
|
||||
nova-api-metadata
|
||||
nova-api-os-compute
|
||||
nova-api
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
=========
|
||||
nova-all
|
||||
=========
|
||||
|
||||
-----------------------------
|
||||
Server for all Nova services
|
||||
-----------------------------
|
||||
|
||||
:Author: openstack@lists.openstack.org
|
||||
:Date: 2012-09-27
|
||||
:Copyright: OpenStack Foundation
|
||||
:Version: 2012.1
|
||||
:Manual section: 1
|
||||
:Manual group: cloud computing
|
||||
|
||||
SYNOPSIS
|
||||
========
|
||||
|
||||
nova-all [options]
|
||||
|
||||
DESCRIPTION
|
||||
===========
|
||||
|
||||
nova-all is a server daemon that serves all Nova services, each in a separate greenthread
|
||||
|
||||
OPTIONS
|
||||
=======
|
||||
|
||||
**General options**
|
||||
|
||||
FILES
|
||||
========
|
||||
|
||||
* /etc/nova/nova.conf
|
||||
* /etc/nova/api-paste.ini
|
||||
* /etc/nova/policy.json
|
||||
* /etc/nova/rootwrap.conf
|
||||
* /etc/nova/rootwrap.d/
|
||||
|
||||
SEE ALSO
|
||||
========
|
||||
|
||||
* `OpenStack Nova <http://nova.openstack.org>`__
|
||||
|
||||
BUGS
|
||||
====
|
||||
|
||||
* Nova bugs are managed at Launchpad `Bugs : Nova <https://bugs.launchpad.net/nova>`__
|
||||
@ -1,91 +0,0 @@
|
||||
# Copyright 2011 OpenStack Foundation
|
||||
# Copyright 2010 United States Government as represented by the
|
||||
# Administrator of the National Aeronautics and Space Administration.
|
||||
# All Rights Reserved.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
"""Starter script for all nova services.
|
||||
|
||||
This script attempts to start all the nova services in one process. Each
|
||||
service is started in its own greenthread. Please note that exceptions and
|
||||
sys.exit() on the starting of a service are logged and the script will
|
||||
continue attempting to launch the rest of the services.
|
||||
|
||||
"""
|
||||
|
||||
import sys
|
||||
|
||||
from oslo_log import log as logging
|
||||
|
||||
import nova.conf
|
||||
from nova import config
|
||||
from nova.i18n import _LE, _LW
|
||||
from nova import objects
|
||||
from nova import service
|
||||
from nova import utils
|
||||
from nova.vnc import xvp_proxy
|
||||
|
||||
|
||||
CONF = nova.conf.CONF
|
||||
|
||||
|
||||
def main():
|
||||
config.parse_args(sys.argv)
|
||||
logging.setup(CONF, "nova")
|
||||
LOG = logging.getLogger('nova.all')
|
||||
utils.monkey_patch()
|
||||
objects.register_all()
|
||||
launcher = service.process_launcher()
|
||||
|
||||
# TODO(sdague): Remove in O
|
||||
LOG.warning(_LW('The nova-all entrypoint is deprecated and will '
|
||||
'be removed in a future release'))
|
||||
# nova-api
|
||||
for api in CONF.enabled_apis:
|
||||
try:
|
||||
should_use_ssl = api in CONF.enabled_ssl_apis
|
||||
server = service.WSGIService(api, use_ssl=should_use_ssl)
|
||||
launcher.launch_service(server, workers=server.workers or 1)
|
||||
except (Exception, SystemExit):
|
||||
LOG.exception(_LE('Failed to load %s-api'), api)
|
||||
|
||||
for mod in [xvp_proxy]:
|
||||
try:
|
||||
launcher.launch_service(mod.get_wsgi_server())
|
||||
except (Exception, SystemExit):
|
||||
LOG.exception(_LE('Failed to load %s'), mod.__name__)
|
||||
|
||||
for binary in ['nova-compute', 'nova-network', 'nova-scheduler',
|
||||
'nova-cert', 'nova-conductor']:
|
||||
|
||||
# FIXME(sirp): Most service configs are defined in nova/service.py, but
|
||||
# conductor has set a new precedent of storing these configs
|
||||
# nova/<service>/api.py.
|
||||
#
|
||||
# We should update the existing services to use this new approach so we
|
||||
# don't have to treat conductor differently here.
|
||||
if binary == 'nova-conductor':
|
||||
topic = CONF.conductor.topic
|
||||
manager = CONF.conductor.manager
|
||||
else:
|
||||
topic = None
|
||||
manager = None
|
||||
|
||||
try:
|
||||
launcher.launch_service(service.Service.create(binary=binary,
|
||||
topic=topic,
|
||||
manager=manager))
|
||||
except (Exception, SystemExit):
|
||||
LOG.exception(_LE('Failed to load %s'), binary)
|
||||
launcher.wait()
|
||||
@ -0,0 +1,5 @@
|
||||
---
|
||||
upgrade:
|
||||
- The nova-all binary to launch all services has been removed after
|
||||
a deprecation period. It was only intended for testing purposes and not
|
||||
production use. Please use the individual Nova binaries to launch services.
|
||||
@ -47,7 +47,6 @@ nova.compute.monitors.cpu =
|
||||
nova.image.download.modules =
|
||||
file = nova.image.download.file
|
||||
console_scripts =
|
||||
nova-all = nova.cmd.all:main
|
||||
nova-api = nova.cmd.api:main
|
||||
nova-api-metadata = nova.cmd.api_metadata:main
|
||||
nova-api-os-compute = nova.cmd.api_os_compute:main
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user