diff options
Diffstat (limited to 'nova/api/ec2')
| -rw-r--r-- | nova/api/ec2/cloud.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 1b3fa5162c..31fd563f6d 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -1351,6 +1351,9 @@ class CloudController(object): msg = _('Image must be available') raise exception.ImageNotActive(message=msg) + iisb = kwargs.get('instance_initiated_shutdown_behavior', 'stop') + shutdown_terminate = (iisb == 'terminate') + flavor = objects.Flavor.get_by_name(context, kwargs.get('instance_type', None)) @@ -1366,7 +1369,8 @@ class CloudController(object): security_group=kwargs.get('security_group'), availability_zone=kwargs.get('placement', {}).get( 'availability_zone'), - block_device_mapping=kwargs.get('block_device_mapping', {})) + block_device_mapping=kwargs.get('block_device_mapping', {}), + shutdown_terminate=shutdown_terminate) instances = self._format_run_instances(context, resv_id) if instances: |