Merge pull request #466 from marcus-ahle/devel

Preventing Nonetype is not iterable error when no tags are set for new ASG
10 years ago · 95aa8481b2
parent 766973993a ba5c36ce5a
commit 95aa8481b2
1 changed files with 1 additions and 1 deletions
--- a/cloud/amazon/ec2_asg.py
+++ b/cloud/amazon/ec2_asg.py
@ -248,7 +248,7 @@ def get_properties(autoscaling_group):
        properties['instance_facts'] = instance_facts
    properties['load_balancers'] = autoscaling_group.load_balancers

-    if hasattr(autoscaling_group, "tags"):
+    if getattr(autoscaling_group, "tags", None):
        properties['tags'] = dict((t.key, t.value) for t in autoscaling_group.tags)

    return properties