← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/openstack/common/rpc/__init__.py

  • 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:
nova/openstack/common/rpc/__init__.py
49
49
    cfg.ListOpt('allowed_rpc_exception_modules',
50
50
                default=['nova.openstack.common.exception',
51
51
                         'nova.exception',
 
52
                         'cinder.exception',
52
53
                         ],
53
54
                help='Modules of exceptions that are permitted to be recreated'
54
55
                     'upon receiving exception data from an rpc call.'),
55
 
    cfg.StrOpt('control_exchange',
56
 
               default='nova',
57
 
               help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
58
56
    cfg.BoolOpt('fake_rabbit',
59
57
                default=False,
60
58
                help='If passed, use a fake RabbitMQ provider'),
 
59
    #
 
60
    # The following options are not registered here, but are expected to be
 
61
    # present. The project using this library must register these options with
 
62
    # the configuration so that project-specific defaults may be defined.
 
63
    #
 
64
    #cfg.StrOpt('control_exchange',
 
65
    #           default='nova',
 
66
    #           help='AMQP exchange to connect to if using RabbitMQ or Qpid'),
61
67
]
62
68
 
63
69
cfg.CONF.register_opts(rpc_opts)
244
250
    Messages sent to the 'foo.<host>' topic are sent to the nova-foo service on
245
251
    <host>.
246
252
    """
247
 
    return '%s.%s' % (topic, host)
 
253
    return '%s.%s' % (topic, host) if host else topic
248
254
 
249
255
 
250
256
_RPCIMPL = None