The only reason for importing nova.config now is where one of the options defined in that file is needed. Rather than importing nova.config using an import statement, use CONF.import_opt() so that it is clear which option we actually require. In future, we will move many options out of nova.config so many of these import_opt() calls will either go away or cause a module other than nova.config to be imported. Change-Id: I0646efddecdf2530903afd50c1f4364cb1d5dce1
		
			
				
	
	
		
			61 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			61 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Python
		
	
	
		
			Executable File
		
	
	
	
	
#!/usr/bin/env python
 | 
						|
# vim: tabstop=4 shiftwidth=4 softtabstop=4
 | 
						|
 | 
						|
# 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 Nova Compute."""
 | 
						|
 | 
						|
import eventlet
 | 
						|
import os
 | 
						|
 | 
						|
if os.name == 'nt':
 | 
						|
    # eventlet monkey patching causes subprocess.Popen to fail on Windows
 | 
						|
    # when using pipes due to missing non blocking I/O support
 | 
						|
    eventlet.monkey_patch(os=False)
 | 
						|
else:
 | 
						|
    eventlet.monkey_patch()
 | 
						|
 | 
						|
import os
 | 
						|
import sys
 | 
						|
 | 
						|
# If ../nova/__init__.py exists, add ../ to Python search path, so that
 | 
						|
# it will override what happens to be installed in /usr/(local/)lib/python...
 | 
						|
POSSIBLE_TOPDIR = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 | 
						|
                                   os.pardir,
 | 
						|
                                   os.pardir))
 | 
						|
if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'nova', '__init__.py')):
 | 
						|
    sys.path.insert(0, POSSIBLE_TOPDIR)
 | 
						|
 | 
						|
 | 
						|
from nova import config
 | 
						|
from nova.openstack.common import cfg
 | 
						|
from nova.openstack.common import log as logging
 | 
						|
from nova import service
 | 
						|
from nova import utils
 | 
						|
 | 
						|
CONF = cfg.CONF
 | 
						|
CONF.import_opt('compute_topic', 'nova.config')
 | 
						|
 | 
						|
if __name__ == '__main__':
 | 
						|
    config.parse_args(sys.argv)
 | 
						|
    logging.setup('nova')
 | 
						|
    utils.monkey_patch()
 | 
						|
    server = service.Service.create(binary='nova-compute',
 | 
						|
                                    topic=CONF.compute_topic)
 | 
						|
    service.serve(server)
 | 
						|
    service.wait()
 |