Merge pull request #30553 from techhat/awsid

AWS: Support 17-character IDs
saltstack · Jan 22, 2016 · f63b183 · f63b183
2 parents 05d0526 + a95fbff
commit f63b183
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/cloud/clouds/ec2.py b/salt/cloud/clouds/ec2.py
@@ -3104,7 +3104,7 @@ def _get_node(name=None, instance_id=None, location=None):
 
     params = {'Action': 'DescribeInstances'}
 
-    if str(name).startswith('i-') and len(name) == 10:
+    if str(name).startswith('i-') and (len(name) == 10 or len(name) == 19):
         instance_id = name
 
     if instance_id: