← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/nova-compute

  • 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-compute
20
20
"""Starter script for Nova Compute."""
21
21
 
22
22
import eventlet
23
 
eventlet.monkey_patch()
 
23
import os
 
24
 
 
25
if os.name == 'nt':
 
26
    # eventlet monkey patching causes subprocess.Popen to fail on Windows
 
27
    # when using pipes due to missing non blocking I/O support
 
28
    eventlet.monkey_patch(os=False)
 
29
else:
 
30
    eventlet.monkey_patch()
24
31
 
25
32
import os
26
33
import sys
34
41
    sys.path.insert(0, POSSIBLE_TOPDIR)
35
42
 
36
43
 
37
 
from nova import flags
 
44
from nova import config
 
45
from nova.openstack.common import cfg
38
46
from nova.openstack.common import log as logging
39
47
from nova import service
40
48
from nova import utils
41
49
 
 
50
CONF = cfg.CONF
 
51
CONF.import_opt('compute_topic', 'nova.config')
 
52
 
42
53
if __name__ == '__main__':
43
 
    flags.parse_args(sys.argv)
 
54
    config.parse_args(sys.argv)
44
55
    logging.setup('nova')
45
56
    utils.monkey_patch()
46
 
    server = service.Service.create(binary='nova-compute')
 
57
    server = service.Service.create(binary='nova-compute',
 
58
                                    topic=CONF.compute_topic)
47
59
    service.serve(server)
48
60
    service.wait()