Merge pull request #7896 from botify-labs/feature/add-instance-monitoring-to-ec2-lc

Adds support for Cloudwatch detailled monitoring in ec2_lc module.
reviewable/pr18780/r1
James Cammarata 11 years ago
commit 0a3e8c8e36

@ -73,6 +73,11 @@ options:
- The spot price you are bidding. Only applies for an autoscaling group with spot instances. - The spot price you are bidding. Only applies for an autoscaling group with spot instances.
required: false required: false
default: null default: null
instance_monitoring:
description:
- whether instances in group are launched with detailed monitoring.
required: false
default: false
aliases: [] aliases: []
extends_documentation_fragment: aws extends_documentation_fragment: aws
""" """
@ -133,6 +138,7 @@ def create_launch_config(connection, module):
volumes = module.params['volumes'] volumes = module.params['volumes']
instance_type = module.params.get('instance_type') instance_type = module.params.get('instance_type')
spot_price = module.params.get('spot_price') spot_price = module.params.get('spot_price')
instance_monitoring = module.params.get('instance_monitoring')
bdm = BlockDeviceMapping() bdm = BlockDeviceMapping()
if volumes: if volumes:
@ -152,7 +158,8 @@ def create_launch_config(connection, module):
user_data=user_data, user_data=user_data,
block_device_mappings=[bdm], block_device_mappings=[bdm],
instance_type=instance_type, instance_type=instance_type,
spot_price=spot_price) spot_price=spot_price,
instance_monitoring=instance_monitoring)
launch_configs = connection.get_all_launch_configurations(names=[name]) launch_configs = connection.get_all_launch_configurations(names=[name])
changed = False changed = False
@ -193,6 +200,7 @@ def main():
instance_type=dict(type='str'), instance_type=dict(type='str'),
state=dict(default='present', choices=['present', 'absent']), state=dict(default='present', choices=['present', 'absent']),
spot_price=dict(type='float'), spot_price=dict(type='float'),
instance_monitoring=dict(default=False, type='bool'),
) )
) )

Loading…
Cancel
Save