Commit d8f9d7c6 by Michael DeHaan

Use correct user to determine host files path, do not reuse .ansible

which is already taken for ansible management ops.
parent 3454fa99
...@@ -28,6 +28,7 @@ import random ...@@ -28,6 +28,7 @@ import random
import traceback import traceback
import tempfile import tempfile
import subprocess import subprocess
import getpass
import ansible.constants as C import ansible.constants as C
import ansible.connection import ansible.connection
...@@ -405,8 +406,9 @@ class Runner(object): ...@@ -405,8 +406,9 @@ class Runner(object):
def _save_setup_result_to_disk(self, conn, result): def _save_setup_result_to_disk(self, conn, result):
''' cache results of calling setup ''' ''' cache results of calling setup '''
dest = os.path.expanduser("~/.ansible/setup_data") dest = os.path.expanduser("~/.ansible_setup_data")
if self.remote_user == 'root': user = getpass.getuser()
if user == 'root':
dest = "/var/lib/ansible/setup_data" dest = "/var/lib/ansible/setup_data"
if not os.path.exists(dest): if not os.path.exists(dest):
os.makedirs(dest) os.makedirs(dest)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment