Updated launch_instance command line tool and image.run() method to include IAM role functionality.

Author: kopertop

bin/launch_instance

@@ -133,6 +133,7 @@ if __name__ == "__main__":
     parser.add_option("-d", "--dns", help="Returns public and private DNS (implicates --wait)", default=False, action="store_true", dest="dns")
     parser.add_option("-T", "--tag", help="Set tag", default=None, action="append", dest="tags", metavar="key:value")
     parser.add_option("-s", "--scripts", help="Pass in a script or a folder containing scripts to be run when the instance starts up, assumes cloud-init. Specify scripts in a list specified by commas. If multiple scripts are specified, they are run lexically (A good way to ensure they run in the order is to prefix filenames with numbers)", type='string', action="callback", callback=scripts_callback)
+    parser.add_option("--role", help="IAM Role to use, this implies --no-add-cred", dest="role")
 
     (options, args) = parser.parse_args()
 
@@ -152,7 +153,7 @@ if __name__ == "__main__":
         print "Region %s not found." % options.region
         sys.exit(1)
     ec2 = boto.connect_ec2(region=region)
-    if not options.nocred:
+    if not options.nocred and not options.role:
         cfg.add_creds(ec2)
 
     iobj = IObject()
@@ -214,10 +215,15 @@ if __name__ == "__main__":
     if options.save_ebs:
         shutdown_proc = "save"
 
+    instance_profile_name = None
+    if options.role:
+        instance_profile_name = options.role
+
     r = ami.run(min_count=int(options.min_count), max_count=int(options.max_count),
             key_name=key_name, user_data=user_data,
             security_groups=groups, instance_type=options.type,
-            placement=options.zone, instance_initiated_shutdown_behavior=shutdown_proc)
+            placement=options.zone, instance_initiated_shutdown_behavior=shutdown_proc,
+            instance_profile_name=instance_profile_name)
 
     instance = r.instances[0]
 

boto/ec2/image.py

@@ -161,7 +161,9 @@ def run(self, min_count=1, max_count=1, key_name=None,
             instance_initiated_shutdown_behavior=None,
             private_ip_address=None,
             placement_group=None, security_group_ids=None,
-            additional_info=None):
+            additional_info=None, instance_profile_name=None,
+            instance_profile_arn=None, tenancy=None):
+
         """
         Runs this instance.
         
@@ -236,7 +238,21 @@ def run(self, min_count=1, max_count=1, key_name=None,
 
         :type security_group_ids: 
         :param security_group_ids:
+
+        :type instance_profile_name: string
+        :param instance_profile_name: The name of an IAM instance profile to use.
+
+        :type instance_profile_arn: string
+        :param instance_profile_arn: The ARN of an IAM instance profile to use.
         
+        :type tenancy: string
+        :param tenancy: The tenancy of the instance you want to launch. An
+                        instance with a tenancy of 'dedicated' runs on
+                        single-tenant hardware and can only be launched into a
+                        VPC. Valid values are: "default" or "dedicated".
+                        NOTE: To use dedicated tenancy you MUST specify a VPC
+                        subnet-ID as well.
+
         :rtype: Reservation
         :return: The :class:`boto.ec2.instance.Reservation` associated with the request for machines
 
@@ -252,7 +268,10 @@ def run(self, min_count=1, max_count=1, key_name=None,
                                              instance_initiated_shutdown_behavior,
                                              private_ip_address, placement_group, 
                                              security_group_ids=security_group_ids,
-                                             additional_info=additional_info)
+                                             additional_info=additional_info, 
+                                             instance_profile_name=instance_profile_name,
+                                             instance_profile_arn=instance_profile_arn,
+                                             tenancy=tenancy)
 
     def deregister(self, delete_snapshot=False):
         return self.connection.deregister_image(self.id, delete_snapshot)