]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
ansible: Place generated playbooks in repo dir
authorZack Cerza <zack@redhat.com>
Wed, 10 Feb 2016 23:07:05 +0000 (16:07 -0700)
committerZack Cerza <zack@redhat.com>
Thu, 18 Feb 2016 21:31:14 +0000 (14:31 -0700)
Signed-off-by: Zack Cerza <zack@redhat.com>
teuthology/task/ansible.py
teuthology/test/task/test_ansible.py

index d37a5a9e24661526f12a5d1bedc1e18a9c670d47..7502aa56237a066311dea4f2aa049d0bc2443010 100644 (file)
@@ -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
index 005529ded95c20ac4cdcae3757d0a35cfdaf9948..b35dcac94afc76c5bb50aca09dc1c042a6d8d91b 100644 (file)
@@ -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