← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/scheduler/chance.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/chance.py
24
24
import random
25
25
 
26
26
from nova import exception
27
 
from nova import flags
 
27
from nova.openstack.common import cfg
28
28
from nova.scheduler import driver
29
29
 
30
 
FLAGS = flags.FLAGS
 
30
CONF = cfg.CONF
 
31
CONF.import_opt('compute_topic', 'nova.config')
31
32
 
32
33
 
33
34
class ChanceScheduler(driver.Scheduler):
65
66
        for num, instance_uuid in enumerate(instance_uuids):
66
67
            request_spec['instance_properties']['launch_index'] = num
67
68
            try:
68
 
                host = self._schedule(context, 'compute', request_spec,
69
 
                                      filter_properties)
 
69
                host = self._schedule(context, CONF.compute_topic,
 
70
                                      request_spec, filter_properties)
70
71
                updated_instance = driver.instance_update_db(context,
71
 
                        instance_uuid, host)
 
72
                        instance_uuid)
72
73
                self.compute_rpcapi.run_instance(context,
73
74
                        instance=updated_instance, host=host,
74
75
                        requested_networks=requested_networks,
88
89
                             filter_properties, instance, instance_type,
89
90
                             reservations):
90
91
        """Select a target for resize."""
91
 
        host = self._schedule(context, 'compute', request_spec,
 
92
        host = self._schedule(context, CONF.compute_topic, request_spec,
92
93
                              filter_properties)
93
94
        self.compute_rpcapi.prep_resize(context, image, instance,
94
95
                instance_type, host, reservations)
95
 
 
96
 
    def schedule_create_volume(self, context, volume_id, snapshot_id,
97
 
                               image_id):
98
 
        """Picks a host that is up at random."""
99
 
        host = self._schedule(context, FLAGS.volume_topic, None, {})
100
 
        driver.cast_to_host(context, FLAGS.volume_topic, host, 'create_volume',
101
 
                            volume_id=volume_id, snapshot_id=snapshot_id,
102
 
                            image_id=image_id)