[pkg-eucalyptus-commits] [euca2ools] 28/41: support --kernel and --ramdisk parameters to euca-bundle-upload (required for bundle-instance for Linux instances)

[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 009f860079ab72cd72a04b847b5d05bb8bf202fe
Author: Sang-Min Park <smpark.uva at gmail.com>
Date:   Mon Aug 19 22:36:19 2013 -0700

    support --kernel and --ramdisk parameters to euca-bundle-upload (required for bundle-instance for Linux instances)
---
 euca2ools/nc/commands/bundleandupload.py |   31 ++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/euca2ools/nc/commands/bundleandupload.py b/euca2ools/nc/commands/bundleandupload.py
index 0b5346c..140e0fc 100644
--- a/euca2ools/nc/commands/bundleandupload.py
+++ b/euca2ools/nc/commands/bundleandupload.py
@@ -71,7 +71,11 @@ class BundleAndUpload(requestbuilder.command.BaseCommand):
                 route_to=None, help='''signature for the upload policy given
                 with --upload-policy'''),
             Arg('-U', '--url', help='storage service endpoint URL'),
-            Arg('--euca-auth', action='store_true', help=argparse.SUPPRESS)]
+            Arg('--euca-auth', action='store_true', help=argparse.SUPPRESS),
+            Arg('--kernel', metavar='IMAGE', help='''ID of the kernel image to
+                associate with the machine bundle'''),
+            Arg('--ramdisk', metavar='IMAGE', help='''ID of the ramdisk image
+                to associate with the machine bundle''')]
     # Note that this is a back end service for which region support is
     # out of scope.  This isn't going to get tested with that.
 
@@ -91,13 +95,24 @@ class BundleAndUpload(requestbuilder.command.BaseCommand):
 
 
     def main(self):
-        cmd = BundleImage(image=self.args['image'], arch=self.args['arch'],
-                          cert=self.args['cert'],
-                          privatekey=self.args['privatekey'],
-                          user=self.args['user'],
-                          destination=self.args.get('directory'),
-                          ec2cert=self.args['ec2cert'], image_type='machine',
-                          config=self.config)
+        if self.args.get('kernel') and self.args.get('ramdisk'):
+            cmd = BundleImage(image=self.args['image'], arch=self.args['arch'],
+                              cert=self.args['cert'],
+                              privatekey=self.args['privatekey'],
+                              user=self.args['user'],
+                              destination=self.args.get('directory'),
+                              ec2cert=self.args['ec2cert'], image_type='machine',
+                              config=self.config,
+                              kernel=self.args['kernel'],
+                              ramdisk=self.args['ramdisk'])
+        else:
+            cmd = BundleImage(image=self.args['image'], arch=self.args['arch'],
+                              cert=self.args['cert'],
+                              privatekey=self.args['privatekey'],
+                              user=self.args['user'],
+                              destination=self.args.get('directory'),
+                              ec2cert=self.args['ec2cert'], image_type='machine',
+                              config=self.config)
         parts, manifest = cmd.main()
 
         cmd = UploadBundle(bucket=self.args['bucket'], manifest=manifest,

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