[Pkg-escience-soc2009] [SCM] Tool for creating VM images. branch, master, updated. 562fae8bd08b80d327d68521d4a3033758bf23da

[David Wendt]

The following commit has been merged in the master branch:
commit 562fae8bd08b80d327d68521d4a3033758bf23da
Author: David Wendt <dcrkid at yahoo.com>
Date:   Fri Aug 14 21:39:42 2009 -0400

    Fixes to registration to use the proper URL, so that registration works properly for eki/eri
    
    Also fixed uploading to use --url instead of --s3_url like it should be.
    
    This one will build, bundle, upload, and register you a Debian machine as well as it's kernels and ramdisks.

diff --git a/VMBuilder/plugins/ec2/__init__.py b/VMBuilder/plugins/ec2/__init__.py
index 9b6bd40..317e62f 100644
--- a/VMBuilder/plugins/ec2/__init__.py
+++ b/VMBuilder/plugins/ec2/__init__.py
@@ -231,7 +231,7 @@ class EC2(Plugin):
                     register_cmdline = ['%sregister' % self.ec2_tools_prefix, uploaded_kernel_manifest, '--access-key', self.vm.ec2_access_key, '--secret-key', self.vm.ec2_secret_key]
 
                     if self.vm.ec2_s3_url:
-                        register_cmdline += ['--url', self.vm.ec2_s3_url]
+                        register_cmdline += ['--url', self.vm.ec2_url]
 
                     registered_eki = run_cmd(*register_cmdline)
 
@@ -244,7 +244,7 @@ class EC2(Plugin):
                         register_cmdline = ['%sregister' % self.ec2_tools_prefix, uploaded_ramdisk_manifest, '--access-key', self.vm.ec2_access_key, '--secret-key', self.vm.ec2_secret_key]
 
                         if self.vm.ec2_s3_url:
-                            register_cmdline += ['--url', self.vm.ec2_s3_url]
+                            register_cmdline += ['--url', self.vm.ec2_url]
 
                         registered_eri = run_cmd(*register_cmdline)
 
@@ -307,7 +307,7 @@ class EC2(Plugin):
                 upload_cmdline = ['%supload-bundle' % self.ec2_tools_prefix, '--manifest', manifest, '--bucket', self.vm.ec2_bucket, '--access-key', self.vm.ec2_access_key, '--secret-key', self.vm.ec2_secret_key]
 
                 if self.vm.ec2_s3_url:
-                    upload_cmdline += ['--s3_url', self.vm.ec2_s3_url]
+                    upload_cmdline += ['--url', self.vm.ec2_s3_url]
 
                 if self.vm.ec2_cloud_cert:
                     upload_cmdline += ['--ec2cert', self.vm.ec2_cloud_cert]
@@ -320,7 +320,7 @@ class EC2(Plugin):
                     register_cmdline = ['%sregister' % self.ec2_tools_prefix, uploaded_image_manifest, '--access-key', self.vm.ec2_access_key, '--secret-key', self.vm.ec2_secret_key]
 
                     if self.vm.ec2_s3_url:
-                        register_cmdline += ['--url', self.vm.ec2_s3_url]
+                        register_cmdline += ['--url', self.vm.ec2_url]
 
                     registered_ami = run_cmd(*register_cmdline)
 

-- 
Tool for creating VM images.