zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-16 15:58:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix test fallout from 321 merge

Browse Source
This commit is contained in:
AlanCoding
2017-10-19 14:45:20 -04:00
parent 5635f5fb49
commit e660879a00
3 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/main/tasks.py
+5 -13
View File
@@ -678,19 +678,11 @@ class BaseTask(LogErrorsTask):
def build_inventory(self, instance, **kwargs):
path = os.path.join(kwargs['private_data_dir'], 'inventory')
if not os.path.exists(path):
with open(path, 'w') as f:
json_data = json.dumps(instance.inventory.get_script_data(hostvars=True))
f.write('#! /usr/bin/env python\n# -*- coding: utf-8 -*-\nprint """%s"""\n' % json_data)
os.chmod(path, stat.S_IRUSR | stat.S_IXUSR)
return path
else:
# work around an inventory caching bug in Ansible 2.4.0
# see: https://github.com/ansible/ansible/pull/30817
# see: https://github.com/ansible/awx/issues/246
inventory_script = tempfile.mktemp(suffix='.awxrest.py', dir=kwargs['private_data_dir'])
shutil.copy(plugin, inventory_script)
return inventory_script
with open(path, 'w') as f:
json_data = json.dumps(instance.inventory.get_script_data(hostvars=True))
f.write('#! /usr/bin/env python\n# -*- coding: utf-8 -*-\nprint """%s"""\n' % json_data)
os.chmod(path, stat.S_IRUSR | stat.S_IXUSR)
return path
def build_args(self, instance, **kwargs):
raise NotImplementedError