[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 347d923e1f780a793b8c55333cf42ee38ba056a2
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Tue May 21 17:27:37 2013 -0700

    Use "certificate" and "private-key" as config vars

diff --git a/euca2ools/commands/bundle/__init__.py b/euca2ools/commands/bundle/__init__.py
index b7e990b..4422743 100644
--- a/euca2ools/commands/bundle/__init__.py
+++ b/euca2ools/commands/bundle/__init__.py
@@ -110,7 +110,7 @@ class BundleCreator(BaseCommand, FileTransferProgressBarMixin):
 def add_bundle_creds(args, config):
     # User's X.509 certificate (user-level in config)
     if not args.get('cert'):
-        config_cert = config.get_user_option('x509-cert')
+        config_cert = config.get_user_option('certificate')
         if 'EC2_CERT' in os.environ:
             args['cert'] = os.getenv('EC2_CERT')
         elif 'EUCA_CERT' in os.environ:  # used by the NC
@@ -128,7 +128,7 @@ def add_bundle_creds(args, config):
 
     # User's private key (user-level in config)
     if not args.get('privatekey'):
-        config_privatekey = config.get_user_option('x509-key')
+        config_privatekey = config.get_user_option('private-key')
         if 'EC2_PRIVATE_KEY' in os.environ:
             args['privatekey'] = os.getenv('EC2_PRIVATE_KEY')
         if 'EUCA_PRIVATE_KEY' in os.environ:  # used by the NC
@@ -147,7 +147,7 @@ def add_bundle_creds(args, config):
 
     # Cloud's X.509 cert (region-level in config)
     if not args.get('ec2cert'):
-        config_privatekey = config.get_region_option('x509-cert')
+        config_privatekey = config.get_region_option('certificate')
         if 'EUCALYPTUS_CERT' in os.environ:
             # This has no EC2 equivalent since they just bundle their cert.
             args['ec2cert'] = os.getenv('EUCALYPTUS_CERT')

-- 
managing cloud instances for Eucalyptus