Commits

Mike Bayer committed 2690f9c

add option to use environment level keys.

Comments (0)

Files changed (2)

ec2control.ini.SAMPLE

 cc=address1@foo.com, address2@bar.com
 
 # Amazon API key/secret.  
+# Alternatively, set the boto environment
+# variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY
+# and omit the keys here.
 aws_key=<Amazon API key>
 aws_secret=<Amazon API secret>
 

ec2control/ec2.py

             raise CommandError("Unknown instance name: %s" % name)
         self.config = config.section_dict("instance_%s" % name)
         self.descriptive_name = self.config['descriptive_name']
-        self._conn = EC2Connection(config['aws_key'], config['aws_secret'])
+        if config.get('aws_key'):
+            self._conn = EC2Connection(config['aws_key'], config['aws_secret'])
+        else:
+            # assume environment.
+            self._conn = EC2Connection()
 
     @property
     def ip_address(self):