← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/scheduler/rpcapi.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/scheduler/rpcapi.py
18
18
Client side of the scheduler manager RPC API.
19
19
"""
20
20
 
21
 
from nova import flags
 
21
from nova.openstack.common import cfg
22
22
from nova.openstack.common import jsonutils
23
23
import nova.openstack.common.rpc.proxy
24
24
 
25
 
 
26
 
FLAGS = flags.FLAGS
 
25
CONF = cfg.CONF
 
26
CONF.import_opt('scheduler_topic', 'nova.config')
27
27
 
28
28
 
29
29
class SchedulerAPI(nova.openstack.common.rpc.proxy.RpcProxy):
46
46
        2.0 - Remove 1.x backwards compat
47
47
        2.1 - Add image_id to create_volume()
48
48
        2.2 - Remove reservations argument to create_volume()
 
49
        2.3 - Remove create_volume()
49
50
    '''
50
51
 
51
52
    #
59
60
    BASE_RPC_API_VERSION = '2.0'
60
61
 
61
62
    def __init__(self):
62
 
        super(SchedulerAPI, self).__init__(topic=FLAGS.scheduler_topic,
 
63
        super(SchedulerAPI, self).__init__(topic=CONF.scheduler_topic,
63
64
                default_version=self.BASE_RPC_API_VERSION)
64
65
 
65
66
    def run_instance(self, ctxt, request_spec, admin_password,
95
96
                disk_over_commit=disk_over_commit, instance=instance_p,
96
97
                dest=dest))
97
98
 
98
 
    def create_volume(self, ctxt, volume_id, snapshot_id, image_id):
99
 
        self.cast(ctxt,
100
 
                  self.make_msg('create_volume',
101
 
                                volume_id=volume_id, snapshot_id=snapshot_id,
102
 
                                image_id=image_id),
103
 
                  version='2.2')
104
 
 
105
99
    def update_service_capabilities(self, ctxt, service_name, host,
106
100
            capabilities):
107
101
        self.fanout_cast(ctxt, self.make_msg('update_service_capabilities',