External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-24 14:36:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

AC-556 Renaming the inventory script to hopefully fix the import error.

Browse Source
This commit is contained in:
Chris Church
2013-10-15 17:35:39 -04:00
parent 30e907e062
commit 52d8fb5b5c
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/tasks.py
View File

@@ -348,7 +348,7 @@ class RunJob(BaseTask):
# the current user. # the current user.
ssh_username = ssh_username or 'root' ssh_username = ssh_username or 'root'
inventory_script = self.get_path_to('..', 'plugins', 'inventory', inventory_script = self.get_path_to('..', 'plugins', 'inventory',
'awx.py') 'awxrest.py')
args = ['ansible-playbook', '-i', inventory_script] args = ['ansible-playbook', '-i', inventory_script]
if job.job_type == 'check': if job.job_type == 'check':
args.append('--check') args.append('--check')

2
awx/main/tests/scripts.py
View File

@@ -131,7 +131,7 @@ class InventoryScriptTest(BaseScriptTest):
#os.environ.setdefault('REST_API_TOKEN', #os.environ.setdefault('REST_API_TOKEN',
# self.super_django_user.auth_token.key) # self.super_django_user.auth_token.key)
name = os.path.join(os.path.dirname(__file__), '..', '..', 'plugins', name = os.path.join(os.path.dirname(__file__), '..', '..', 'plugins',
'inventory', 'awx.py') 'inventory', 'awxrest.py')
return self.run_script(name, *args, **options) return self.run_script(name, *args, **options)
def test_without_inventory_id(self): def test_without_inventory_id(self):

0
awx/plugins/inventory/awx.py → awx/plugins/inventory/awxrest.py
View File