← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/nova-api

  • 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-api
36
36
    sys.path.insert(0, possible_topdir)
37
37
 
38
38
 
39
 
from nova import flags
 
39
from nova import config
 
40
from nova.openstack.common import cfg
40
41
from nova.openstack.common import log as logging
41
42
from nova import service
42
43
from nova import utils
43
44
 
 
45
CONF = cfg.CONF
 
46
CONF.import_opt('enabled_apis', 'nova.config')
 
47
 
44
48
if __name__ == '__main__':
45
 
    flags.parse_args(sys.argv)
 
49
    config.parse_args(sys.argv)
46
50
    logging.setup("nova")
47
51
    utils.monkey_patch()
48
52
    launcher = service.ProcessLauncher()
49
 
    for api in flags.FLAGS.enabled_apis:
 
53
    for api in CONF.enabled_apis:
50
54
        server = service.WSGIService(api)
51
55
        launcher.launch_server(server, workers=server.workers or 1)
52
56
    launcher.wait()