From: Zack Cerza Date: Wed, 10 Feb 2016 23:07:05 +0000 (-0700) Subject: ansible: Place generated playbooks in repo dir X-Git-Tag: 1.1.0~675^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d02dbfdd14d83c48204b5da87b4af1d760794b59;p=teuthology.git ansible: Place generated playbooks in repo dir Signed-off-by: Zack Cerza --- diff --git a/teuthology/task/ansible.py b/teuthology/task/ansible.py index d37a5a9e2..7502aa562 100644 --- a/teuthology/task/ansible.py +++ b/teuthology/task/ansible.py @@ -225,8 +225,11 @@ class Ansible(Task): pb_buffer.write('---\n') yaml.safe_dump(self.playbook, pb_buffer) pb_buffer.seek(0) - playbook_file = NamedTemporaryFile(prefix="teuth_ansible_playbook_", - delete=False) + playbook_file = NamedTemporaryFile( + prefix="teuth_ansible_playbook_", + dir=self.repo_path, + delete=False, + ) playbook_file.write(pb_buffer.read()) playbook_file.flush() self.playbook_file = playbook_file diff --git a/teuthology/test/task/test_ansible.py b/teuthology/test/task/test_ansible.py index 005529ded..b35dcac94 100644 --- a/teuthology/test/task/test_ansible.py +++ b/teuthology/test/task/test_ansible.py @@ -228,9 +228,11 @@ class TestAnsibleTask(TestTask): playbook_file_obj.name = playbook_file_path with patch.object(ansible, 'NamedTemporaryFile') as m_NTF: m_NTF.return_value = playbook_file_obj + task.find_repo() task.get_playbook() task.generate_playbook() m_NTF.assert_called_once_with(prefix="teuth_ansible_playbook_", + dir=task.repo_path, delete=False) assert task.generated_playbook is True assert task.playbook_file == playbook_file_obj