From d8f9d7c6c966e34e1ea225a41cc26b4835e04830 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sat, 14 Apr 2012 16:08:04 -0400 Subject: [PATCH] Use correct user to determine host files path, do not reuse .ansible which is already taken for ansible management ops. --- lib/ansible/runner.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py index a715b531251..78d01609470 100755 --- a/lib/ansible/runner.py +++ b/lib/ansible/runner.py @@ -28,6 +28,7 @@ import random import traceback import tempfile import subprocess +import getpass import ansible.constants as C import ansible.connection @@ -405,8 +406,9 @@ class Runner(object): def _save_setup_result_to_disk(self, conn, result): ''' cache results of calling setup ''' - dest = os.path.expanduser("~/.ansible/setup_data") - if self.remote_user == 'root': + dest = os.path.expanduser("~/.ansible_setup_data") + user = getpass.getuser() + if user == 'root': dest = "/var/lib/ansible/setup_data" if not os.path.exists(dest): os.makedirs(dest)