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

[dkavanagh]

The following commit has been merged in the master branch:
commit 8781e6a0c7e24508c22fdbbd9f803c495e03385f
Author: dkavanagh <dkavanagh at gmail.com>
Date:   Wed Mar 20 14:01:39 2013 -0400

    TOOLS-184
    ensure files identified as kernel or ramdisk don't get re-registered as image

diff --git a/euca2ools/commands/eustore/installimage.py b/euca2ools/commands/eustore/installimage.py
index 0b2347e..772c4ab 100644
--- a/euca2ools/commands/eustore/installimage.py
+++ b/euca2ools/commands/eustore/installimage.py
@@ -261,6 +261,7 @@ class InstallImage(AWSQueryRequest):
         kernel_id=self.cli_options.kernel
         ramdisk_id=self.cli_options.ramdisk
         kernel_found = False
+        files_bundled = []
         if kernel_id==None:
             for i in [0, 1]:
                 tar_root = os.path.commonprefix(names)
@@ -276,6 +277,7 @@ class InstallImage(AWSQueryRequest):
                                 if prefix:
                                     name = prefix+name
                                 kernel_id = self.bundleFile(path, name, description, arch, 'true', None)
+                                files_bundled.append(path)
                                 kernel_found = True
                                 print kernel_id
                             elif re.match(".*(initr(d|amfs)|loader).*", name):
@@ -283,6 +285,7 @@ class InstallImage(AWSQueryRequest):
                                 if prefix:
                                     name = prefix+name
                                 ramdisk_id = self.bundleFile(path, name, description, arch, None, 'true')
+                                files_bundled.append(path)
                                 print ramdisk_id
                 if not(kernel_found):
                     if not(kernel_dir):
@@ -298,7 +301,7 @@ class InstallImage(AWSQueryRequest):
         for path in names:
             name = os.path.basename(path)
             if not name.startswith('.'):
-                if name.endswith('.img'):
+                if name.endswith('.img') and not(path in files_bundled):
                     print "Bundling/uploading image"
                     if prefix:
                         name = prefix
@@ -351,6 +354,7 @@ class InstallImage(AWSQueryRequest):
                     aws_secret_access_key=euare_svc.args['aws_secret_access_key'],\
                     port=euare_svc.args['port'], path=euare_svc.args['path'],\
                     is_secure=euare_svc.args['is_secure'])
+        conn.https_validate_certificates = False
         aliases = conn.get_account_alias()
         if not(aliases.list_account_aliases_result.account_aliases[0]=='eucalyptus') and not(self.cli_options.kernel):
             print >> sys.stderr, "Error: must be cloud admin to upload kernel/ramdisk. try specifying existing ones with --kernel and --ramdisk"

-- 
managing cloud instances for Eucalyptus