External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-06-28 18:08:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

SCM Inventory field name changes

Browse Source 
on InventorySource model
* scm_project -> source_project
on InventorySourceSerializer
* scm_inventories -> scm_inventory_sources

on InventoryUpdate model
* scm_project_update -> source_project_update
This commit is contained in:
AlanCoding
2017-05-04 09:15:29 -04:00
parent 24a04d56f1
commit d826c45ac6
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/tasks.py
View File

@@ -1367,7 +1367,7 @@ class RunProjectUpdate(BaseTask):
'another update is already active.'.format(inv.name))
continue
local_inv_update = inv_src.create_inventory_update(
scm_project_update_id=project_update.id,
source_project_update_id=project_update.id,
launch_type='scm',
_eager_fields=dict(
status='running',
@@ -1802,13 +1802,13 @@ class RunInventoryUpdate(BaseTask):
def pre_run_hook(self, inventory_update, **kwargs):
self.custom_dir_path = []
scm_project = None
source_project = None
if inventory_update.inventory_source:
scm_project = inventory_update.inventory_source.scm_project
if (inventory_update.source=='scm' and scm_project and
source_project = inventory_update.inventory_source.source_project
if (inventory_update.source=='scm' and source_project and
not inventory_update.inventory_source.update_on_project_update):
request_id = '' if self.request.id is None else self.request.id
local_project_sync = scm_project.create_project_update(
local_project_sync = source_project.create_project_update(
launch_type="sync",
_eager_params=dict(
job_type='run',