diff options
| author | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-19 11:17:20 -0700 |
|---|---|---|
| committer | Sandy Walsh <sandy.walsh@rackspace.com> | 2011-05-19 11:17:20 -0700 |
| commit | ce37d88a91c016fdb7f29a9178fb0b08a6a8f1b2 (patch) | |
| tree | 5c7b750a4ff891d28fea9cbbe3e77baac551b53d | |
| parent | c7e0b5d13f16e53036d77c91322d9e000252660f (diff) | |
| download | nova-ce37d88a91c016fdb7f29a9178fb0b08a6a8f1b2.tar.gz nova-ce37d88a91c016fdb7f29a9178fb0b08a6a8f1b2.tar.xz nova-ce37d88a91c016fdb7f29a9178fb0b08a6a8f1b2.zip | |
temp
| -rw-r--r-- | nova/api/openstack/servers.py | 2 | ||||
| -rw-r--r-- | nova/scheduler/zone_aware_scheduler.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 12008d44a..738910bc8 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -162,7 +162,7 @@ class Controller(common.OpenstackController): msg = _("Server name is not defined") return exc.HTTPBadRequest(msg) - zone_blob = env.get('blob', None) + zone_blob = env['server'].get('blob') name = env['server']['name'] self._validate_server_name(name) name = name.strip() diff --git a/nova/scheduler/zone_aware_scheduler.py b/nova/scheduler/zone_aware_scheduler.py index 6600951fb..9572d1c9f 100644 --- a/nova/scheduler/zone_aware_scheduler.py +++ b/nova/scheduler/zone_aware_scheduler.py @@ -150,7 +150,8 @@ class ZoneAwareScheduler(driver.Scheduler): raise exception.NotAuthorized(_("Bad credentials attempting " "to talk to zone at %(url)s.") % locals()) - nova.servers.create(name, image, flavor, ipgroup, meta, files) + nova.servers.create(name, image, flavor, ipgroup, meta, files, + child_blob) def select(self, context, request_spec, *args, **kwargs): """Select returns a list of weights and zone/host information |