wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[cloud] ec2.py: warn that removing a public ipv4 address is not permitted - fixes #30679 (#30952)

Browse source 
* Add a warning to ec2.py if assign_public_ip is different from the matching instance(s) since it isn't a modifiable attribute.

* remove comments
This commit is contained in:
Sloane Hertel 2017-10-05 15:32:52 -04:00 committed by Ryan Brown
parent f219d6b96d
commit efe3c94b1b
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/ansible/modules/cloud/amazon/ec2.py
View file

@ -988,6 +988,8 @@ def enforce_count(module, ec2, vpc):
inst = get_instance_info(inst) inst = get_instance_info(inst)
all_instances.append(inst) all_instances.append(inst)
warn_if_public_ip_assignment_changed(module, inst)
return (all_instances, instance_dict_array, changed_instance_ids, changed) return (all_instances, instance_dict_array, changed_instance_ids, changed)
@ -1445,6 +1447,8 @@ def startstop_instances(module, ec2, instance_ids, state, instance_tags):
for res in ec2.get_all_instances(instance_ids, filters=filters): for res in ec2.get_all_instances(instance_ids, filters=filters):
for inst in res.instances: for inst in res.instances:
warn_if_public_ip_assignment_changed(module, inst)
# Check "source_dest_check" attribute # Check "source_dest_check" attribute
try: try:
if inst.vpc_id is not None and inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check: if inst.vpc_id is not None and inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check:
@ -1572,6 +1576,8 @@ def restart_instances(module, ec2, instance_ids, state, instance_tags):
for res in ec2.get_all_instances(instance_ids, filters=filters): for res in ec2.get_all_instances(instance_ids, filters=filters):
for inst in res.instances: for inst in res.instances:
warn_if_public_ip_assignment_changed(module, inst)
# Check "source_dest_check" attribute # Check "source_dest_check" attribute
try: try:
if inst.vpc_id is not None and inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check: if inst.vpc_id is not None and inst.get_attribute('sourceDestCheck')['sourceDestCheck'] != source_dest_check:
@ -1607,6 +1613,16 @@ def restart_instances(module, ec2, instance_ids, state, instance_tags):
return (changed, instance_dict_array, instance_ids) return (changed, instance_dict_array, instance_ids)
def warn_if_public_ip_assignment_changed(module, instance):
# This is a non-modifiable attribute.
assign_public_ip = module.params.get('assign_public_ip')
# Check that public ip assignment is the same and warn if not
if (assign_public_ip or instance.public_dns_name) and (not instance.public_dns_name or not assign_public_ip):
module.warn("Unable to modify public ip assignment to {0} for instance {1}. "
"Whether or not to assign a public IP is determined during instance creation.".format(assign_public_ip, instance.id))
def main(): def main():
argument_spec = ec2_argument_spec() argument_spec = ec2_argument_spec()
argument_spec.update( argument_spec.update(