External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix bugs related to python3

Browse Source
This commit is contained in:
AlanCoding
2019-01-17 16:43:49 -05:00
parent 6c130fa6c3
commit 43eff55fd4
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -2163,7 +2163,6 @@ class RunInventoryUpdate(BaseTask):
if private_data_files is None: if private_data_files is None:
private_data_files = {} private_data_files = {}
self.add_awx_venv(env) self.add_awx_venv(env)
self.add_ansible_venv(inventory_update.ansible_virtualenv_path, env)
# Pass inventory source ID to inventory script. # Pass inventory source ID to inventory script.
env['INVENTORY_SOURCE_ID'] = str(inventory_update.inventory_source_id) env['INVENTORY_SOURCE_ID'] = str(inventory_update.inventory_source_id)
env['INVENTORY_UPDATE_ID'] = str(inventory_update.pk) env['INVENTORY_UPDATE_ID'] = str(inventory_update.pk)
@@ -2287,7 +2286,6 @@ class RunInventoryUpdate(BaseTask):
cloud_cred = inventory_update.get_cloud_credential() cloud_cred = inventory_update.get_cloud_credential()
injector = InventorySource.injectors[cloud_cred.kind](self.get_ansible_version(inventory_update)) injector = InventorySource.injectors[cloud_cred.kind](self.get_ansible_version(inventory_update))
content = injector.inventory_contents(inventory_update) content = injector.inventory_contents(inventory_update)
content = content.encode('utf-8')
# must be a statically named file # must be a statically named file
inventory_path = os.path.join(private_data_dir, injector.filename) inventory_path = os.path.join(private_data_dir, injector.filename)
with open(inventory_path, 'w') as f: with open(inventory_path, 'w') as f: