[pkg-eucalyptus-commits] [SCM] managing cloud instances for Eucalyptus branch, master, updated. 3.0.0-alpha3-257-g1da8e3a

[Garrett Holmstrom]

The following commit has been merged in the master branch:
commit ff567f83ec9dd5bb7e0315a4bc38f7348f175fdc
Merge: 58485c19ea5f8ac5ad35a26a202cc9fbc3829055 ab63b01ee83c4cdc60b3395089dc9c2cf6ba1aa0
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue May 14 15:09:20 2013 -0700

    Merge remote-tracking branch 'mspaulding06/euca_bundle_vol_initial_commit' into requestbuilder

diff --combined euca2ools/commands/argtypes.py
index c18f112,b7f15ce..333c7fc
--- a/euca2ools/commands/argtypes.py
+++ b/euca2ools/commands/argtypes.py
@@@ -34,6 -34,21 +34,21 @@@ from requestbuilder import EMPT
  import sys
  
  
+ def manifest_block_device_mappings(mappings_as_str):
+     mappings = {}
+     mapping_strs = mappings_as_str.split(',')
+     for mapping_str in mapping_strs:
+         if mapping_str.strip():
+             bits = mapping_str.strip().split('=')
+             if len(bits) == 2:
+                 mappings[bits[0].strip()] = bits[1].strip()
+             else:
+                 raise argparse.ArgumentTypeError(
+                     "invalid device mapping '{0}' (must have format "
+                     "'VIRTUAL=DEVICE')".format(mapping_str))
+     return mappings
+ 
+ 
  def ec2_block_device_mapping(map_as_str):
      '''
      Parse a block device mapping from an image registration command line.
@@@ -46,7 -61,7 +61,7 @@@
              .format(map_as_str))
      map_dict = {'DeviceName': device}
      if mapping.lower() == 'none':
 -        map_dict['NoDevice'] = 'none'
 +        map_dict['NoDevice'] = 'true'
      elif mapping.startswith('ephemeral'):
          map_dict['VirtualName'] = mapping
      elif (mapping.startswith('snap-') or mapping.startswith('vol-') or

-- 
managing cloud instances for Eucalyptus