ec2 launch configuration boto3 upgrade (#26348)

Updates ec2_lc module to use boto3. Adds parameters:

instance_id
placement_tenancy

Also added a second example using instance_id and updated the docs with the new parameters.

lib/ansible/modules/cloud/amazon/ec2_lc.py

@@ -19,24 +19,31 @@ ANSIBLE_METADATA = {'metadata_version': '1.0',
                     'supported_by': 'curated'}
 
 
-DOCUMENTATION = """
+DOCUMENTATION = '''
 ---
 module: ec2_lc
+
 short_description: Create or delete AWS Autoscaling Launch Configurations
+
 description:
   - Can create or delete AWS Autoscaling Configurations
   - Works with the ec2_asg module to manage Autoscaling Groups
+
 notes:
-  - "Amazon ASG Autoscaling Launch Configurations are immutable once created, so modifying the configuration
+  - Amazon ASG Autoscaling Launch Configurations are immutable once created, so modifying the configuration after it is changed will not modify the
-    after it is changed will not modify the launch configuration on AWS. You must create a new config and assign
+    launch configuration on AWS. You must create a new config and assign it to the ASG instead.
-    it to the ASG instead."
   - encrypted volumes are supported on versions >= 2.4
+
 version_added: "1.6"
-author: "Gareth Rushgrove (@garethr)"
+
+author:
+  - "Gareth Rushgrove (@garethr)"
+  - "Willem van Ketwich (@wilvk)"
+
 options:
   state:
     description:
-      - register or deregister the instance
+      - Register or deregister the instance
     required: true
     choices: ['present', 'absent']
   name:
@@ -45,95 +52,95 @@ options:
     required: true
   instance_type:
     description:
-      - instance type to use for the instance
+      - Instance type to use for the instance
     required: true
     default: null
     aliases: []
   image_id:
     description:
       - The AMI unique identifier to be used for the group
-    required: false
   key_name:
     description:
       - The SSH key name to be used for access to managed instances
-    required: false
   security_groups:
     description:
-      - A list of security groups to apply to the instances. Since version 2.4 you can specify either security group names or IDs or a mix.  Previous to 2.4,
+      - A list of security groups to apply to the instances. Since version 2.4 you can specify either security group names or IDs or a mix.  Previous
-        for VPC instances, specify security group IDs and for EC2-Classic, specify either security group names or IDs.
+        to 2.4, for VPC instances, specify security group IDs and for EC2-Classic, specify either security group names or IDs.
-    required: false
   volumes:
     description:
-      - a list of volume dicts, each containing device name and optionally ephemeral id or snapshot id.
+      - A list of volume dicts, each containing device name and optionally ephemeral id or snapshot id. Size and type (and number of iops for io
-        Size and type (and number of iops for io device type) must be specified for a new volume or a root volume, and may be passed for a snapshot volume.
+        device type) must be specified for a new volume or a root volume, and may be passed for a snapshot volume. For any volume, a volume size less
-        For any volume, a volume size less than 1 will be interpreted as a request not to create the volume.
+        than 1 will be interpreted as a request not to create the volume.
-    required: false
   user_data:
     description:
-      - opaque blob of data which is made available to the ec2 instance. Mutually exclusive with I(user_data_path).
+      - Opaque blob of data which is made available to the ec2 instance. Mutually exclusive with I(user_data_path).
-    required: false
   user_data_path:
     description:
       - Path to the file that contains userdata for the ec2 instances. Mutually exclusive with I(user_data).
-    required: false
     version_added: "2.3"
   kernel_id:
     description:
       - Kernel id for the EC2 instance
-    required: false
   spot_price:
     description:
       - The spot price you are bidding. Only applies for an autoscaling group with spot instances.
-    required: false
   instance_monitoring:
     description:
-      - whether instances in group are launched with detailed monitoring.
+      - Specifies whether instances are launched with detailed monitoring.
     default: false
   assign_public_ip:
     description:
-      - Used for Auto Scaling groups that launch instances into an Amazon Virtual Private Cloud. Specifies whether to assign a public IP
+      - Used for Auto Scaling groups that launch instances into an Amazon Virtual Private Cloud. Specifies whether to assign a public IP address
-        address to each instance launched in a Amazon VPC.
+        to each instance launched in a Amazon VPC.
-    required: false
     version_added: "1.8"
   ramdisk_id:
     description:
       - A RAM disk id for the instances.
-    required: false
     version_added: "1.8"
   instance_profile_name:
     description:
       - The name or the Amazon Resource Name (ARN) of the instance profile associated with the IAM role for the instances.
-    required: false
     version_added: "1.8"
   ebs_optimized:
     description:
       - Specifies whether the instance is optimized for EBS I/O (true) or not (false).
-    required: false
     default: false
     version_added: "1.8"
   classic_link_vpc_id:
     description:
       - Id of ClassicLink enabled VPC
-    required: false
     version_added: "2.0"
   classic_link_vpc_security_groups:
     description:
-      - A list of security group id's with which to associate the ClassicLink VPC instances.
+      - A list of security group IDs with which to associate the ClassicLink VPC instances.
-    required: false
     version_added: "2.0"
   vpc_id:
     description:
       - VPC ID, used when resolving security group names to IDs.
-    required: false
     version_added: "2.4"
+  instance_id:
+    description:
+      - The Id of a running instance to use as a basis for a launch configuration. Can be used in place of image_id and instance_type.
+    version_added: "2.4"
+  placement_tenancy:
+    description:
+      - Determines whether the instance runs on single-tenant harware or not.
+    default: 'default'
+    version_added: "2.4"
+
 extends_documentation_fragment:
     - aws
     - ec2
+
 requirements:
-    - "boto >= 2.39.0"
+    - boto3 >= 1.4.4
-"""
+
+'''
 
 EXAMPLES = '''
+
+# create a launch configuration using an AMI image and instance type as a basis
+
 - name: note that encrypted volumes are only supported in >= Ansible 2.4
   ec2_lc:
     name: special
@@ -151,26 +158,35 @@ EXAMPLES = '''
     - device_name: /dev/sdb
       ephemeral: ephemeral0
 
-'''
+# create a launch configuration using a running instance id as a basis
-import traceback
 
-from ansible.module_utils.basic import *
+- ec2_lc:
-from ansible.module_utils.ec2 import ec2_argument_spec, ec2_connect, connect_to_aws, \
+    name: special
-    get_ec2_security_group_ids_from_names, get_aws_connection_info, AnsibleAWSError
+    instance_id: i-00a48b207ec59e948
+    key_name: default
+    security_groups: ['launch-wizard-2' ]
+    volumes:
+    - device_name: /dev/sda1
+      volume_size: 120
+      device_type: io1
+      iops: 3000
+      delete_on_termination: true
+
+'''
+
+import traceback
+from ansible.module_utils.ec2 import (get_aws_connection_info, ec2_argument_spec, ec2_connect, camel_dict_to_snake_dict, get_ec2_security_group_ids_from_names,
+                                      boto3_conn, snake_dict_to_camel_dict, HAS_BOTO3)
+from ansible.module_utils._text import to_text
+from ansible.module_utils.basic import AnsibleModule
 
 try:
-    from boto.ec2.blockdevicemapping import BlockDeviceType, BlockDeviceMapping
+    import botocore
-    import boto.ec2.autoscale
-    from boto.ec2.autoscale import LaunchConfiguration
-    from boto.exception import BotoServerError
-    HAS_BOTO = True
 except ImportError:
-    HAS_BOTO = False
+    pass
 
 
-def create_block_device(module, volume):
+def create_block_device_meta(module, volume):
-    # Not aware of a way to determine this programatically
-    # http://aws.amazon.com/about-aws/whats-new/2013/10/09/ebs-provisioned-iops-maximum-iops-gb-ratio-increased-to-30-1/
     MAX_IOPS_TO_SIZE_RATIO = 30
     if 'snapshot' not in volume and 'ephemeral' not in volume:
         if 'volume_size' not in volume:
@@ -181,169 +197,223 @@ def create_block_device(module, volume):
     if 'ephemeral' in volume:
         if 'snapshot' in volume:
             module.fail_json(msg='Cannot set both ephemeral and snapshot')
-    return BlockDeviceType(snapshot_id=volume.get('snapshot'),
+
-                           ephemeral_name=volume.get('ephemeral'),
+    return_object = {}
-                           size=volume.get('volume_size'),
+
-                           volume_type=volume.get('device_type'),
+    if 'ephemeral' in volume:
-                           delete_on_termination=volume.get('delete_on_termination', False),
+        return_object['VirtualName'] = volume.get('ephemeral')
-                           iops=volume.get('iops'),
+
-                           encrypted=volume.get('encrypted',None))
+    if 'device_name' in volume:
+        return_object['DeviceName'] = volume.get('device_name')
+
+    if 'no_device' is volume:
+        return_object['NoDevice'] = volume.get('no_device')
+
+    if any(key in volume for key in ['snapshot', 'volume_size', 'volume_type', 'delete_on_termination', 'ips', 'encrypted']):
+        return_object['Ebs'] = {}
+
+    if 'snapshot' in volume:
+        return_object['Ebs']['SnapshotId'] = volume.get('snapshot')
+
+    if 'volume_size' in volume:
+        return_object['Ebs']['VolumeSize'] = volume.get('volume_size')
+
+    if 'volume_type' in volume:
+        return_object['Ebs']['VolumeType'] = volume.get('volume_type')
+
+    if 'delete_on_termination' in volume:
+        return_object['Ebs']['DeleteOnTermination'] = volume.get('delete_on_termination', False)
+
+    if 'iops' in volume:
+        return_object['Ebs']['Iops'] = volume.get('iops')
+
+    if 'encrypted' in volume:
+        return_object['Ebs']['Encrypted'] = volume.get('encrypted')
+
+    return return_object
 
 
 def create_launch_config(connection, module):
     name = module.params.get('name')
-    image_id = module.params.get('image_id')
-    key_name = module.params.get('key_name')
     vpc_id = module.params.get('vpc_id')
     try:
-        security_groups = get_ec2_security_group_ids_from_names(module.params.get('security_groups'), ec2_connect(module), vpc_id=vpc_id, boto3=False)
+        region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module, boto3=True)
+        ec2_connection = boto3_conn(module, 'client', 'ec2', region, ec2_url, **aws_connect_kwargs)
+        security_groups = get_ec2_security_group_ids_from_names(module.params.get('security_groups'), ec2_connection, vpc_id=vpc_id, boto3=True)
+    except botocore.exceptions.ClientError as e:
+        module.fail_json(msg="Failed to get Security Group IDs", exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
     except ValueError as e:
-        module.fail_json(msg=str(e))
+        module.fail_json(msg="Failed to get Security Group IDs", exception=traceback.format_exc())
     user_data = module.params.get('user_data')
     user_data_path = module.params.get('user_data_path')
     volumes = module.params['volumes']
-    instance_type = module.params.get('instance_type')
-    spot_price = module.params.get('spot_price')
     instance_monitoring = module.params.get('instance_monitoring')
     assign_public_ip = module.params.get('assign_public_ip')
-    kernel_id = module.params.get('kernel_id')
-    ramdisk_id = module.params.get('ramdisk_id')
     instance_profile_name = module.params.get('instance_profile_name')
     ebs_optimized = module.params.get('ebs_optimized')
     classic_link_vpc_id = module.params.get('classic_link_vpc_id')
     classic_link_vpc_security_groups = module.params.get('classic_link_vpc_security_groups')
-    bdm = BlockDeviceMapping()
+
+    block_device_mapping = {}
+
+    convert_list = ['image_id', 'instance_type', 'instance_type', 'instance_id', 'placement_tenancy', 'key_name', 'kernel_id', 'ramdisk_id',
+                    'instance_profile_name', 'spot_price']
+
+    launch_config = (snake_dict_to_camel_dict(dict((k.capitalize(), str(v)) for k, v in module.params.items() if v is not None and k in convert_list)))
 
     if user_data_path:
         try:
             with open(user_data_path, 'r') as user_data_file:
                 user_data = user_data_file.read()
         except IOError as e:
-            module.fail_json(msg=str(e), exception=traceback.format_exc())
+            module.fail_json(msg="Failed to open file for reading", exception=traceback.format_exc())
 
     if volumes:
         for volume in volumes:
             if 'device_name' not in volume:
                 module.fail_json(msg='Device name must be set for volume')
-            # Minimum volume size is 1GB. We'll use volume size explicitly set to 0
+            # Minimum volume size is 1GB. We'll use volume size explicitly set to 0 to be a signal not to create this volume
-            # to be a signal not to create this volume
             if 'volume_size' not in volume or int(volume['volume_size']) > 0:
-                bdm[volume['device_name']] = create_block_device(module, volume)
+                block_device_mapping.update(create_block_device_meta(module, volume))
 
-    lc = LaunchConfiguration(
+    try:
-        name=name,
+        launch_configs = connection.describe_launch_configurations(LaunchConfigurationNames=[name]).get('LaunchConfigurations')
-        image_id=image_id,
+    except botocore.exceptions.ClientError as e:
-        key_name=key_name,
+        module.fail_json(msg="Failed to describe launch configuration by name", exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
-        security_groups=security_groups,
-        user_data=user_data,
-        block_device_mappings=[bdm],
-        instance_type=instance_type,
-        kernel_id=kernel_id,
-        spot_price=spot_price,
-        instance_monitoring=instance_monitoring,
-        associate_public_ip_address=assign_public_ip,
-        ramdisk_id=ramdisk_id,
-        instance_profile_name=instance_profile_name,
-        ebs_optimized=ebs_optimized,
-        classic_link_vpc_security_groups=classic_link_vpc_security_groups,
-        classic_link_vpc_id=classic_link_vpc_id,
-    )
 
-    launch_configs = connection.get_all_launch_configurations(names=[name])
     changed = False
-    if not launch_configs:
+    result = {}
-        try:
-            connection.create_launch_configuration(lc)
-            launch_configs = connection.get_all_launch_configurations(names=[name])
-            changed = True
-        except BotoServerError as e:
-            module.fail_json(msg=str(e))
 
-    result = dict(
+    launch_config['LaunchConfigurationName'] = name
-                 ((a[0], a[1]) for a in vars(launch_configs[0]).items()
+
-                  if a[0] not in ('connection', 'created_time', 'instance_monitoring', 'block_device_mappings'))
+    if security_groups is not None:
-        )
+        launch_config['SecurityGroups'] = security_groups
-    result['created_time'] = str(launch_configs[0].created_time)
+
-    # Looking at boto's launchconfig.py, it looks like this could be a boolean
+    if classic_link_vpc_id is not None:
-    # value or an object with an enabled attribute.  The enabled attribute
+        launch_config['ClassicLinkVPCId'] = classic_link_vpc_id
-    # could be a boolean or a string representation of a boolean.  Since
+
-    # I can't test all permutations myself to see if my reading of the code is
+    if instance_monitoring:
-    # correct, have to code this *very* defensively
+        launch_config['InstanceMonitoring'] = {'Enabled': instance_monitoring}
-    if launch_configs[0].instance_monitoring is True:
+
-        result['instance_monitoring'] = True
+    if classic_link_vpc_security_groups is not None:
-    else:
+        launch_config['ClassicLinkVPCSecurityGroups'] = classic_link_vpc_security_groups
+
+    if block_device_mapping:
+        launch_config['BlockDeviceMappings'] = [block_device_mapping]
+
+    if instance_profile_name is not None:
+        launch_config['IamInstanceProfile'] = instance_profile_name
+
+    if assign_public_ip is not None:
+        launch_config['AssociatePublicIpAddress'] = assign_public_ip
+
+    if user_data is not None:
+        launch_config['UserData'] = user_data
+
+    if ebs_optimized is not None:
+        launch_config['EbsOptimized'] = ebs_optimized
+
+    if len(launch_configs) == 0:
         try:
-            result['instance_monitoring'] = module.boolean(launch_configs[0].instance_monitoring.enabled)
+            connection.create_launch_configuration(**launch_config)
-        except AttributeError:
+            launch_configs = connection.describe_launch_configurations(LaunchConfigurationNames=[name]).get('LaunchConfigurations')
-            result['instance_monitoring'] = False
+            changed = True
-    if launch_configs[0].block_device_mappings is not None:
+            if launch_configs:
-        result['block_device_mappings'] = []
+                launch_config = launch_configs[0]
-        for bdm in launch_configs[0].block_device_mappings:
+        except botocore.exceptions.ClientError as e:
-            result['block_device_mappings'].append(dict(device_name=bdm.device_name, virtual_name=bdm.virtual_name))
+            module.fail_json(msg="Failed to create launch configuration", exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
-            if bdm.ebs is not None:
+
-                result['block_device_mappings'][-1]['ebs'] = dict(snapshot_id=bdm.ebs.snapshot_id, volume_size=bdm.ebs.volume_size)
+    result = (dict((k, v) for k, v in launch_config.items()
+              if k not in ['Connection', 'CreatedTime', 'InstanceMonitoring', 'BlockDeviceMappings']))
+
+    result['CreatedTime'] = to_text(launch_config.get('CreatedTime'))
+
+    try:
+        result['InstanceMonitoring'] = module.boolean(launch_config.get('InstanceMonitoring').get('Enabled'))
+    except AttributeError:
+        result['InstanceMonitoring'] = False
+
+    result['BlockDeviceMappings'] = []
+
+    for block_device_mapping in launch_config.get('BlockDeviceMappings', []):
+        result['BlockDeviceMappings'].append(dict(device_name=block_device_mapping.get('DeviceName'), virtual_name=block_device_mapping.get('VirtualName')))
+        if block_device_mapping.get('Ebs') is not None:
+            result['BlockDeviceMappings'][-1]['ebs'] = dict(
+                snapshot_id=block_device_mapping.get('Ebs').get('SnapshotId'), volume_size=block_device_mapping.get('Ebs').get('VolumeSize'))
 
     if user_data_path:
-        result['user_data'] = "hidden" # Otherwise, we dump binary to the user's terminal
+        result['UserData'] = "hidden"  # Otherwise, we dump binary to the user's terminal
 
-    module.exit_json(changed=changed, name=result['name'], created_time=result['created_time'],
+    return_object = {
-                     image_id=result['image_id'], arn=result['launch_configuration_arn'],
+        'Name': result.get('LaunchConfigurationName'),
-                     security_groups=result['security_groups'],
+        'CreatedTime': result.get('CreatedTime'),
-                     instance_type=result['instance_type'],
+        'ImageId': result.get('ImageId'),
-                     result=result)
+        'Arn': result.get('LaunchConfigurationARN'),
+        'SecurityGroups': result.get('SecurityGroups'),
+        'InstanceType': result.get('InstanceType'),
+        'Result': result
+    }
+
+    module.exit_json(changed=changed, **camel_dict_to_snake_dict(return_object))
 
 
 def delete_launch_config(connection, module):
-    name = module.params.get('name')
+    try:
-    launch_configs = connection.get_all_launch_configurations(names=[name])
+        name = module.params.get('name')
-    if launch_configs:
+        launch_configs = connection.describe_launch_configurations(LaunchConfigurationNames=[name]).get('LaunchConfigurations')
-        launch_configs[0].delete()
+        if launch_configs:
-        module.exit_json(changed=True)
+            connection.delete_launch_configuration(LaunchConfigurationName=launch_configs[0].get('LaunchConfigurationName'))
-    else:
+            module.exit_json(changed=True)
-        module.exit_json(changed=False)
+        else:
+            module.exit_json(changed=False)
+    except botocore.exceptions.ClientError as e:
+        module.fail_json(msg="Failed to delete launch configuration", exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
 
 
 def main():
     argument_spec = ec2_argument_spec()
     argument_spec.update(
         dict(
-            name=dict(required=True, type='str'),
+            name=dict(required=True),
-            image_id=dict(type='str'),
+            image_id=dict(),
-            key_name=dict(type='str'),
+            instance_id=dict(),
-            security_groups=dict(type='list'),
+            key_name=dict(),
-            user_data=dict(type='str'),
+            security_groups=dict(default=[], type='list'),
+            user_data=dict(),
             user_data_path=dict(type='path'),
-            kernel_id=dict(type='str'),
+            kernel_id=dict(),
             volumes=dict(type='list'),
-            instance_type=dict(type='str'),
+            instance_type=dict(),
             state=dict(default='present', choices=['present', 'absent']),
             spot_price=dict(type='float'),
-            ramdisk_id=dict(type='str'),
+            ramdisk_id=dict(),
-            instance_profile_name=dict(type='str'),
+            instance_profile_name=dict(),
             ebs_optimized=dict(default=False, type='bool'),
             associate_public_ip_address=dict(type='bool'),
             instance_monitoring=dict(default=False, type='bool'),
             assign_public_ip=dict(type='bool'),
             classic_link_vpc_security_groups=dict(type='list'),
-            classic_link_vpc_id=dict(type='str'),
+            classic_link_vpc_id=dict(),
-            vpc_id=dict(type='str')
+            vpc_id=dict(),
+            placement_tenancy=dict(default='default', choices=['default', 'dedicated'])
         )
     )
 
     module = AnsibleModule(
         argument_spec=argument_spec,
-        mutually_exclusive = [['user_data', 'user_data_path']]
+        mutually_exclusive=[['user_data', 'user_data_path']]
     )
 
-    if not HAS_BOTO:
+    if not HAS_BOTO3:
-        module.fail_json(msg='boto required for this module')
+        module.fail_json(msg='boto3 required for this module')
-
-    region, ec2_url, aws_connect_params = get_aws_connection_info(module)
 
     try:
-        connection = connect_to_aws(boto.ec2.autoscale, region, **aws_connect_params)
+        region, ec2_url, aws_connect_kwargs = get_aws_connection_info(module, boto3=True)
-    except (boto.exception.NoAuthHandlerFound, AnsibleAWSError) as e:
+        connection = boto3_conn(module, conn_type='client', resource='autoscaling', region=region, endpoint=ec2_url, **aws_connect_kwargs)
-        module.fail_json(msg=str(e))
+    except botocore.exceptions.NoRegionError:
+        module.fail_json(msg=("region must be specified as a parameter in AWS_DEFAULT_REGION environment variable or in boto configuration file"))
+    except botocore.exceptions.ClientError as e:
+        module.fail_json(msg="unable to establish connection - " + str(e), exception=traceback.format_exc(), **camel_dict_to_snake_dict(e.response))
 
     state = module.params.get('state')
 
@@ -352,5 +422,6 @@ def main():
     elif state == 'absent':
         delete_launch_config(connection, module)
 
+
 if __name__ == '__main__':
     main()

test/sanity/pep8/legacy-files.txt

@@ -19,7 +19,6 @@ lib/ansible/modules/cloud/amazon/ec2_ami_find.py
 lib/ansible/modules/cloud/amazon/ec2_eip.py
 lib/ansible/modules/cloud/amazon/ec2_eni_facts.py
 lib/ansible/modules/cloud/amazon/ec2_key.py
-lib/ansible/modules/cloud/amazon/ec2_lc.py
 lib/ansible/modules/cloud/amazon/ec2_lc_facts.py
 lib/ansible/modules/cloud/amazon/ec2_metric_alarm.py
 lib/ansible/modules/cloud/amazon/ec2_scaling_policy.py