diff options
| author | Eric Smalling <Eric.Smalling@wnco.com> | 2013-02-15 16:14:17 -0600 |
|---|---|---|
| committer | Eric Smalling <Eric.Smalling@wnco.com> | 2013-02-15 16:16:31 -0600 |
| commit | edb13da85e507b286e58366a126c251f5c71a38c (patch) | |
| tree | 98f38e9756ae618c9e28ef85bbd7b475e8c83d8a | |
| parent | 7648c388157434840ab1954ba30c446dc4e21ac1 (diff) | |
| download | boto-edb13da85e507b286e58366a126c251f5c71a38c.tar.gz | |
1. Removed invalid ".Ebs." from the "NoDevice" parameter.
2. If "NoDevice" is needed, will no longer list any "Ebs" type parameters as they were causing AWS to launch instances with no root device at all (even if a 3nd block device was defined).
3. Removed "true" value from ".NoDevice" parameter.
| -rw-r--r-- | boto/ec2/blockdevicemapping.py | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/boto/ec2/blockdevicemapping.py b/boto/ec2/blockdevicemapping.py index ca0e9373..df774ae9 100644 --- a/boto/ec2/blockdevicemapping.py +++ b/boto/ec2/blockdevicemapping.py @@ -125,17 +125,18 @@ class BlockDeviceMapping(dict): params['%s.VirtualName' % pre] = block_dev.ephemeral_name else: if block_dev.no_device: - params['%s.Ebs.NoDevice' % pre] = 'true' - if block_dev.snapshot_id: - params['%s.Ebs.SnapshotId' % pre] = block_dev.snapshot_id - if block_dev.size: - params['%s.Ebs.VolumeSize' % pre] = block_dev.size - if block_dev.delete_on_termination: - params['%s.Ebs.DeleteOnTermination' % pre] = 'true' + params['%s.NoDevice' % pre] = '' else: - params['%s.Ebs.DeleteOnTermination' % pre] = 'false' - if block_dev.volume_type: - params['%s.Ebs.VolumeType' % pre] = block_dev.volume_type - if block_dev.iops is not None: - params['%s.Ebs.Iops' % pre] = block_dev.iops + if block_dev.snapshot_id: + params['%s.Ebs.SnapshotId' % pre] = block_dev.snapshot_id + if block_dev.size: + params['%s.Ebs.VolumeSize' % pre] = block_dev.size + if block_dev.delete_on_termination: + params['%s.Ebs.DeleteOnTermination' % pre] = 'true' + else: + params['%s.Ebs.DeleteOnTermination' % pre] = 'false' + if block_dev.volume_type: + params['%s.Ebs.VolumeType' % pre] = block_dev.volume_type + if block_dev.iops is not None: + params['%s.Ebs.Iops' % pre] = block_dev.iops i += 1 |