From: Andrew Schoen <aschoen@redhat.com>
Date: Fri, 14 Aug 2015 14:10:32 +0000 (-0500)
Subject: ansible: rename log to fail_log to not conflict with ansible.log
X-Git-Tag: 1.1.0~849^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F597%2Fhead;p=teuthology.git

ansible: rename log to fail_log to not conflict with ansible.log

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/teuthology/task/ansible.py b/teuthology/task/ansible.py
index 03fe4ab75..e4f14695f 100644
--- a/teuthology/task/ansible.py
+++ b/teuthology/task/ansible.py
@@ -263,9 +263,9 @@ class Ansible(Task):
 
     def _handle_failure(self, command, status):
         failures = None
-        with open(self.failure_log.name, 'r') as log:
+        with open(self.failure_log.name, 'r') as fail_log:
             try:
-                failures = yaml.safe_load(log)
+                failures = yaml.safe_load(fail_log)
             except yaml.parser.ParserError:
                 log.exception(
                     "Failed to parse ansible failure log: {0}".format(