← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to bin/nova-all

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/nova-all
40
40
    sys.path.insert(0, possible_topdir)
41
41
 
42
42
 
43
 
from nova import flags
 
43
from nova import config
44
44
from nova.objectstore import s3server
 
45
from nova.openstack.common import cfg
45
46
from nova.openstack.common import log as logging
46
47
from nova import service
47
48
from nova import utils
48
49
from nova.vnc import xvp_proxy
49
50
 
50
51
 
 
52
CONF = cfg.CONF
 
53
CONF.import_opt('enabled_apis', 'nova.config')
51
54
LOG = logging.getLogger('nova.all')
52
55
 
53
56
if __name__ == '__main__':
54
 
    flags.parse_args(sys.argv)
 
57
    config.parse_args(sys.argv)
55
58
    logging.setup("nova")
56
59
    utils.monkey_patch()
57
60
    launcher = service.ProcessLauncher()
58
61
 
59
62
    # nova-api
60
 
    for api in flags.FLAGS.enabled_apis:
 
63
    for api in CONF.enabled_apis:
61
64
        try:
62
65
            server = service.WSGIService(api)
63
66
            launcher.launch_server(server, workers=server.workers or 1)
70
73
        except (Exception, SystemExit):
71
74
            LOG.exception(_('Failed to load %s') % mod.__name__)
72
75
 
73
 
    for binary in ['nova-compute', 'nova-volume',
74
 
                   'nova-network', 'nova-scheduler', 'nova-cert']:
 
76
    for binary in ['nova-compute', 'nova-network', 'nova-scheduler',
 
77
                   'nova-cert']:
75
78
        try:
76
79
            launcher.launch_server(service.Service.create(binary=binary))
77
80
        except (Exception, SystemExit):