[pkg-eucalyptus-commits] [euca2ools] 24/41: Fix launch config block dev mapping syntax

[Charles Plessy]

This is an automated email from the git hooks/post-receive script.

plessy pushed a commit to branch master
in repository euca2ools.

commit a8a59da395688484cdc5887e2ffe283c18c12e06
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Fri Aug 23 14:25:32 2013 -0700

    Fix launch config block dev mapping syntax
    
    Fixes TOOLS-376
---
 .../commands/autoscaling/createlaunchconfiguration.py    |   14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/euca2ools/commands/autoscaling/createlaunchconfiguration.py b/euca2ools/commands/autoscaling/createlaunchconfiguration.py
index 4696567..f5ecaa2 100644
--- a/euca2ools/commands/autoscaling/createlaunchconfiguration.py
+++ b/euca2ools/commands/autoscaling/createlaunchconfiguration.py
@@ -45,10 +45,10 @@ class CreateLaunchConfiguration(AutoScalingRequest):
                 help='instance type for use for instances (required)'),
             Arg('--block-device-mapping', dest='BlockDeviceMappings.member',
                 metavar='DEVICE1=MAPPED1,DEVICE2=MAPPED2,...',
-                type=delimited_list(','), help='''a comma-separated list of
-                block device mappings for the image, in the form DEVICE=MAPPED,
-                where "MAPPED" is "none", "ephemeral(0-3)", or
-                "[SNAP-ID]:[SIZE]:[true|false]'''),
+                type=delimited_list(',', item_type=ec2_block_device_mapping),
+                help='''a comma-separated list of block device mappings for the
+                image, in the form DEVICE=MAPPED, where "MAPPED" is "none",
+                "ephemeral(0-3)", or "[SNAP-ID]:[SIZE]:[true|false]'''),
             Arg('--ebs-optimized', dest='EbsOptimized', action='store_const',
                 const='true',
                 help='whether the instance is optimized for EBS I/O'),
@@ -104,9 +104,3 @@ class CreateLaunchConfiguration(AutoScalingRequest):
             with open(self.args['user_data_file']) as user_data_file:
                 self.params['UserData'] = base64.b64encode(
                     user_data_file.read())
-
-    def preprocess(self):
-        if self.args.get('block_device_mapping'):
-            mappings = map(ec2_block_device_mapping,
-                           self.args['block_device_mapping'])
-            self.params['BlockDeviceMappings.member'] = mappings

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-eucalyptus/euca2ools.git