diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-15 09:45:22 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-06-15 09:45:22 -0700 |
| commit | 4c54aa28a8c414752d73084e3a4094e5df79b618 (patch) | |
| tree | 9bd670046637485aaafd7a96836e75bfc9a70768 | |
| parent | 6e2f79f5452b0a470d5001e9a0428fe90f987ac8 (diff) | |
fixed up some little project_id things with new novaclient
| -rw-r--r-- | nova/scheduler/zone_aware_scheduler.py | 4 | ||||
| -rw-r--r-- | tools/pip-requires | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/scheduler/zone_aware_scheduler.py b/nova/scheduler/zone_aware_scheduler.py index 69d4c6034..0ec83ec2e 100644 --- a/nova/scheduler/zone_aware_scheduler.py +++ b/nova/scheduler/zone_aware_scheduler.py @@ -88,7 +88,7 @@ class ZoneAwareScheduler(driver.Scheduler): instance_properties = request_spec['instance_properties'] name = instance_properties['display_name'] - image_id = instance_properties['image_id'] + image_ref = instance_properties['image_ref'] meta = instance_properties['metadata'] flavor_id = instance_type['flavorid'] reservation_id = instance_properties['reservation_id'] @@ -112,7 +112,7 @@ class ZoneAwareScheduler(driver.Scheduler): raise exception.NotAuthorized(_("Bad credentials attempting " "to talk to zone at %(url)s.") % locals()) - nova.servers.create(name, image_id, flavor_id, ipgroup, meta, files, + nova.servers.create(name, image_ref, flavor_id, ipgroup, meta, files, child_blob, reservation_id=reservation_id) def _provision_resource_from_blob(self, context, item, instance_id, diff --git a/tools/pip-requires b/tools/pip-requires index 168dacd40..57557bc9d 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -10,7 +10,7 @@ boto==1.9b carrot==0.10.5 eventlet==0.9.12 lockfile==0.8 -python-novaclient==2.5 +python-novaclient==2.5.2 python-daemon==1.5.5 python-gflags==1.3 redis==2.0.0 |