summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-06-23 22:45:58 -0700
committerChris Behrens <cbehrens@codestud.com>2011-06-23 22:45:58 -0700
commit2c303bcc8f47aaa5cdeee0ee91e3f4b434176f15 (patch)
tree6c6e4c2a2ec10add5b08e4b7309c1bf2ea335101
parent65ec0ce423e211215d82001778560dcaa92866a1 (diff)
downloadnova-2c303bcc8f47aaa5cdeee0ee91e3f4b434176f15.tar.gz
nova-2c303bcc8f47aaa5cdeee0ee91e3f4b434176f15.tar.xz
nova-2c303bcc8f47aaa5cdeee0ee91e3f4b434176f15.zip
missed passing in min/max_count into the create/create_all_at_once calls
-rw-r--r--nova/api/openstack/create_instance_helper.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/api/openstack/create_instance_helper.py b/nova/api/openstack/create_instance_helper.py
index 3e055936c..4c6cc0f83 100644
--- a/nova/api/openstack/create_instance_helper.py
+++ b/nova/api/openstack/create_instance_helper.py
@@ -120,6 +120,8 @@ class CreateInstanceHelper(object):
min_count = int(min_count)
if max_count:
max_count = int(max_count)
+ if min_count > max_count:
+ min_count = max_count
try:
inst_type = \
@@ -143,7 +145,9 @@ class CreateInstanceHelper(object):
injected_files=injected_files,
admin_password=password,
zone_blob=zone_blob,
- reservation_id=reservation_id))
+ reservation_id=reservation_id,
+ min_count=min_count,
+ max_count=max_count))
except quota.QuotaError as error:
self._handle_quota_error(error)
except exception.ImageNotFound as error: