diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-02 17:17:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-02 17:17:51 +0000 |
| commit | 0e10079e99e8bbea94a2f0c47d21bdfe8131c603 (patch) | |
| tree | ef3eb984e5619521543e2a236f693b1e106a0685 | |
| parent | a8bfe3c854c40ad0f655ddf9b270ff6b373eb4ae (diff) | |
| parent | 63a5ad95f581354abf60c67a9f865041f5d5e05f (diff) | |
| download | horizon-0e10079e99e8bbea94a2f0c47d21bdfe8131c603.tar.gz | |
Merge "Enable launching instance from zero-size image snapshot"2014.2.rc1
| -rw-r--r-- | openstack_dashboard/dashboards/project/instances/workflows/create_instance.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py index 9a74ee85f..5d0ada1e1 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/create_instance.py @@ -110,7 +110,7 @@ class SetInstanceDetailsAction(workflows.Action): volume_size = forms.IntegerField(label=_("Device size (GB)"), initial=1, - min_value=1, + min_value=0, required=False, help_text=_("Volume size in gigabytes " "(integer value).")) @@ -221,9 +221,13 @@ class SetInstanceDetailsAction(workflows.Action): if source_type in ('image_id', 'volume_image_id'): if source_type == 'volume_image_id': - if not self.data.get('volume_size', None): + volume_size = self.data.get('volume_size', None) + if not volume_size: msg = _("You must set volume size") self._errors['volume_size'] = self.error_class([msg]) + if float(volume_size) <= 0: + msg = _("Volume size must be greater than 0") + self._errors['volume_size'] = self.error_class([msg]) if not cleaned_data.get('device_name'): msg = _("You must set device name") self._errors['device_name'] = self.error_class([msg]) |