From 3e52f47b51ab1e693090099d829205f557a8446f Mon Sep 17 00:00:00 2001 From: Ryan Fitzpatrick Date: Fri, 23 Jun 2017 12:33:55 -0400 Subject: [PATCH] [cloud] Fixes #26045 Ensure instance.instance_profile is not None before casting to dict (#26047) --- lib/ansible/modules/cloud/amazon/ec2_remote_facts.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/cloud/amazon/ec2_remote_facts.py b/lib/ansible/modules/cloud/amazon/ec2_remote_facts.py index a66ca39cce9..b61ac362c99 100644 --- a/lib/ansible/modules/cloud/amazon/ec2_remote_facts.py +++ b/lib/ansible/modules/cloud/amazon/ec2_remote_facts.py @@ -108,9 +108,11 @@ def get_instance_info(instance): except AttributeError: pass + instance_profile = dict(instance.instance_profile) if instance.instance_profile is not None else None + instance_info = { 'id': instance.id, 'kernel': instance.kernel, - 'instance_profile': dict(instance.instance_profile), + 'instance_profile': instance_profile, 'root_device_type': instance.root_device_type, 'private_dns_name': instance.private_dns_name, 'public_dns_name': instance.public_dns_name,