diff options
| author | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-08-15 11:50:54 -0700 |
|---|---|---|
| committer | Tushar Patil <tushar.vitthal.patil@gmail.com> | 2011-08-15 11:50:54 -0700 |
| commit | 8666aca320ce95840a378231bfe81bc4e759df6e (patch) | |
| tree | f1a62c7bc3bd98915b411d180834336aa654c742 | |
| parent | 4fc0801c18e1127e3e7072d318e227518a9b1929 (diff) | |
| download | nova-8666aca320ce95840a378231bfe81bc4e759df6e.tar.gz nova-8666aca320ce95840a378231bfe81bc4e759df6e.tar.xz nova-8666aca320ce95840a378231bfe81bc4e759df6e.zip | |
Fixed merging issue
| -rw-r--r-- | nova/api/openstack/create_instance_helper.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py index 7e9d48c02..c8798536e 100644 --- a/nova/api/openstack/create_instance_helper.py +++ b/nova/api/openstack/create_instance_helper.py @@ -164,7 +164,7 @@ class CreateInstanceHelper(object): reservation_id=reservation_id, min_count=min_count, max_count=max_count, - user_data=user_data)) + user_data=user_data, availability_zone=availability_zone)) except quota.QuotaError as error: self._handle_quota_error(error) |