diff options
| author | Daniel Lindsley <daniel@toastdriven.com> | 2013-09-13 15:13:25 -0700 |
|---|---|---|
| committer | Daniel Lindsley <daniel@toastdriven.com> | 2013-09-13 15:13:25 -0700 |
| commit | 974743fe89b351de4b74d94211b30aeee9a31001 (patch) | |
| tree | 95ca9dc9c07157528b24fea2a51e7d612230cd24 | |
| parent | 0a52c82114fb6777b22fc078a6e3232d37c3d5c7 (diff) | |
| download | boto-974743fe89b351de4b74d94211b30aeee9a31001.tar.gz | |
Revert "Fixes #1709 - Cannot create Launch Configuration with Block Device Mappings"
This worked correctly for AutoScaling, but broke EC2. A modified patch
will land shortly.
This reverts commit 5fd728e8464b40b91a8e25058e1b828853f5cb43.
| -rw-r--r-- | boto/ec2/blockdevicemapping.py | 2 | ||||
| -rw-r--r-- | tests/unit/ec2/autoscale/test_group.py | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/boto/ec2/blockdevicemapping.py b/boto/ec2/blockdevicemapping.py index 1fb67b53..df774ae9 100644 --- a/boto/ec2/blockdevicemapping.py +++ b/boto/ec2/blockdevicemapping.py @@ -118,7 +118,7 @@ class BlockDeviceMapping(dict): def build_list_params(self, params, prefix=''): i = 1 for dev_name in self: - pre = '%sBlockDeviceMappings.member.%d' % (prefix, i) + pre = '%sBlockDeviceMapping.%d' % (prefix, i) params['%s.DeviceName' % pre] = dev_name block_dev = self[dev_name] if block_dev.ephemeral_name: diff --git a/tests/unit/ec2/autoscale/test_group.py b/tests/unit/ec2/autoscale/test_group.py index 6500a63a..659527b0 100644 --- a/tests/unit/ec2/autoscale/test_group.py +++ b/tests/unit/ec2/autoscale/test_group.py @@ -233,12 +233,12 @@ class TestLaunchConfiguration(AWSMockServiceTestCase): self.assert_request_parameters({ 'Action': 'CreateLaunchConfiguration', - 'BlockDeviceMappings.member.1.DeviceName': '/dev/sdf', - 'BlockDeviceMappings.member.1.Ebs.DeleteOnTermination': 'false', - 'BlockDeviceMappings.member.1.Ebs.SnapshotId': 'snap-12345', - 'BlockDeviceMappings.member.2.DeviceName': '/dev/sdg', - 'BlockDeviceMappings.member.2.Ebs.DeleteOnTermination': 'false', - 'BlockDeviceMappings.member.2.Ebs.SnapshotId': 'snap-12346', + 'BlockDeviceMapping.1.DeviceName': '/dev/sdf', + 'BlockDeviceMapping.1.Ebs.DeleteOnTermination': 'false', + 'BlockDeviceMapping.1.Ebs.SnapshotId': 'snap-12345', + 'BlockDeviceMapping.2.DeviceName': '/dev/sdg', + 'BlockDeviceMapping.2.Ebs.DeleteOnTermination': 'false', + 'BlockDeviceMapping.2.Ebs.SnapshotId': 'snap-12346', 'EbsOptimized': 'false', 'LaunchConfigurationName': 'launch_config', 'ImageId': '123456', |