Merge pull request #3263 from tlipatov/ec2_ami_json_fail

Fixed typo json_fail to fail_json

cloud/amazon/ec2_ami.py

@@ -377,7 +377,7 @@ def main():
     try:
         ec2 = ec2_connect(module)
     except Exception, e:
-        module.json_fail(msg="Error while connecting to aws: %s" % str(e))
+        module.fail_json(msg="Error while connecting to aws: %s" % str(e))
 
     if module.params.get('state') == 'absent':
         if not module.params.get('image_id'):