diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-23 16:19:51 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-23 16:19:51 -0700 |
| commit | 5d5aad97c3c12ca304cc2b9eb46cf7f25d996b4a (patch) | |
| tree | bb95d5c01677af9da30ab8b1509c2a4c5207b268 | |
| parent | 1017b3f6b26da08187e6c81e6182d38badf74b35 (diff) | |
| parent | c61ed0605d443551087c54406b39e00273a6750d (diff) | |
| download | nova-5d5aad97c3c12ca304cc2b9eb46cf7f25d996b4a.tar.gz nova-5d5aad97c3c12ca304cc2b9eb46cf7f25d996b4a.tar.xz nova-5d5aad97c3c12ca304cc2b9eb46cf7f25d996b4a.zip | |
local tweaks
| -rw-r--r-- | nova/scheduler/zone_aware_scheduler.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/nova/scheduler/zone_aware_scheduler.py b/nova/scheduler/zone_aware_scheduler.py index 9572d1c9f..3f967e18e 100644 --- a/nova/scheduler/zone_aware_scheduler.py +++ b/nova/scheduler/zone_aware_scheduler.py @@ -23,12 +23,16 @@ across zones. There are two expansion points to this class for: import operator import M2Crypto +from nova import crypto from nova import db -from nova import rpc +from nova import flags from nova import log as logging +from nova import rpc + from nova.scheduler import api from nova.scheduler import driver +FLAGS = flags.FLAGS LOG = logging.getLogger('nova.scheduler.zone_aware_scheduler') @@ -75,7 +79,7 @@ class ZoneAwareScheduler(driver.Scheduler): if "hostname" in item: self._provision_resource_locally(context, item, instance_id, kwargs) - return + return self._provision_resource_in_child_zone(context, item, instance_id, request_spec, kwargs) @@ -99,6 +103,7 @@ class ZoneAwareScheduler(driver.Scheduler): # 1. valid, # 2. intended for this zone or a child zone. # if 2 ... forward call to child zone. + LOG.debug(_("****** PROVISION IN CHILD %(item)s") % locals()) blob = item['blob'] decryptor = crypto.decryptor(FLAGS.build_plan_encryption_key) host_info = None @@ -131,7 +136,7 @@ class ZoneAwareScheduler(driver.Scheduler): instance_properties = request_spec['instance_properties'] name = instance_properties['display_name'] - image_id = instance_properties['image_id']) + image_id = instance_properties['image_id'] flavor_id = instance_type['flavor_id'] meta = instance_type['metadata'] |