|
 |
cf5968 |
Index: euca2ools-2.1.4/euca2ools/commands/euca/register.py
|
|
|
cf5968 |
===================================================================
|
|
|
cf5968 |
--- euca2ools-2.1.4.orig/euca2ools/commands/euca/register.py
|
|
|
cf5968 |
+++ euca2ools-2.1.4/euca2ools/commands/euca/register.py
|
|
|
cf5968 |
@@ -37,7 +37,7 @@ import sys
|
|
|
cf5968 |
from boto.roboto.param import Param
|
|
|
cf5968 |
|
|
|
cf5968 |
class Register(euca2ools.commands.eucacommand.EucaCommand):
|
|
|
cf5968 |
-
|
|
|
cf5968 |
+ APIVersion = '2010-06-15'
|
|
|
cf5968 |
Description = 'Registers a manifest for use with the cloud.'
|
|
|
cf5968 |
Options = [Param(name='block_device_mapping',
|
|
|
cf5968 |
short_name='b', long_name='block-device-mapping',
|
|
|
cf5968 |
@@ -67,7 +67,12 @@ class Register(euca2ools.commands.eucaco
|
|
|
cf5968 |
doc='The root device name (e.g., /dev/sda1, or xvda).'),
|
|
|
cf5968 |
Param(name='snapshot', short_name='s', long_name='snapshot',
|
|
|
cf5968 |
optional=True, ptype='string',
|
|
|
cf5968 |
- doc='The snapshot ID to use as the root device.')]
|
|
|
cf5968 |
+ doc='The snapshot ID to use as the root device.'),
|
|
|
cf5968 |
+ Param(name='virtualization_type',
|
|
|
cf5968 |
+ long_name='virtualization-type', optional=True,
|
|
|
cf5968 |
+ ptype='string',
|
|
|
cf5968 |
+ doc=('[Privileged only] type of virtualization to '
|
|
|
cf5968 |
+ 'register the image with'))]
|
|
|
cf5968 |
Args = [Param(name='image_location',
|
|
|
cf5968 |
optional=True, ptype='string',
|
|
|
cf5968 |
doc="""Path to the uploaded image (bucket/manifest).
|
|
|
cf5968 |
@@ -104,7 +109,8 @@ class Register(euca2ools.commands.eucaco
|
|
|
cf5968 |
kernel_id=self.kernel,
|
|
|
cf5968 |
ramdisk_id=self.ramdisk,
|
|
|
cf5968 |
root_device_name=self.root_device_name,
|
|
|
cf5968 |
- block_device_map=self.block_device_mapping)
|
|
|
cf5968 |
+ block_device_map=self.block_device_mapping,
|
|
|
cf5968 |
+ virtualization_type=self.virtualization_type)
|
|
|
cf5968 |
|
|
|
cf5968 |
def main_cli(self):
|
|
|
cf5968 |
image_id = self.main()
|
|
|
cf5968 |
Index: euca2ools-2.1.4/euca2ools/commands/eustore/installimage.py
|
|
|
cf5968 |
===================================================================
|
|
|
cf5968 |
--- euca2ools-2.1.4.orig/euca2ools/commands/eustore/installimage.py
|
|
|
cf5968 |
+++ euca2ools-2.1.4/euca2ools/commands/eustore/installimage.py
|
|
|
cf5968 |
@@ -240,6 +240,7 @@ class InstallImage(AWSQueryRequest):
|
|
|
cf5968 |
obj.root_device_name=None
|
|
|
cf5968 |
obj.kernel=kernel_id
|
|
|
cf5968 |
obj.ramdisk=ramdisk_id
|
|
|
cf5968 |
+ obj.virtualization_type=None
|
|
|
cf5968 |
return obj.main()
|
|
|
cf5968 |
|
|
|
cf5968 |
def bundleAll(self, file, prefix, description, arch):
|