diff options
| author | Jesse Andrews <anotherjesse@gmail.com> | 2011-08-18 15:33:15 -0700 |
|---|---|---|
| committer | Jesse Andrews <anotherjesse@gmail.com> | 2011-08-18 15:33:15 -0700 |
| commit | 983e37ac5451cf26baf3460b33c90da498dff8ea (patch) | |
| tree | 553d4d212a4a8a4dc508d33ab910ef00c7690c5a /nova/api | |
| parent | 805c1cec609b39ee5a0ba1517bf2f1d41e0c4fa9 (diff) | |
| parent | 2cb2e71454373f6baa857c8d73122c485e18c4c3 (diff) | |
| download | nova-983e37ac5451cf26baf3460b33c90da498dff8ea.tar.gz nova-983e37ac5451cf26baf3460b33c90da498dff8ea.tar.xz nova-983e37ac5451cf26baf3460b33c90da498dff8ea.zip | |
merge trunk
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/create_instance_helper.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py index 031b06921..e64a076c8 100644 --- a/nova/api/openstack/create_instance_helper.py +++ b/nova/api/openstack/create_instance_helper.py @@ -117,6 +117,7 @@ class CreateInstanceHelper(object): raise exc.HTTPBadRequest(explanation=msg) zone_blob = server_dict.get('blob') + user_data = server_dict.get('user_data') availability_zone = server_dict.get('availability_zone') name = server_dict['name'] self._validate_server_name(name) @@ -158,6 +159,7 @@ class CreateInstanceHelper(object): reservation_id=reservation_id, min_count=min_count, max_count=max_count, + user_data=user_data, availability_zone=availability_zone)) except quota.QuotaError as error: self._handle_quota_error(error) |