Enforce extra_vars override hierachy

This commit is contained in:
Aaron Tan
2017-07-26 18:10:33 -04:00
parent 22e1e14c4f
commit 047ad7ca4a
5 changed files with 55 additions and 24 deletions

View File

@@ -424,7 +424,7 @@ def copy_model_by_class(obj1, Class2, fields, kwargs):
# Apply class-specific extra processing for origination of unified jobs
if hasattr(obj1, '_update_unified_job_kwargs') and obj1.__class__ != Class2:
new_kwargs = obj1._update_unified_job_kwargs(**create_kwargs)
new_kwargs = obj1._update_unified_job_kwargs(create_kwargs, kwargs)
else:
new_kwargs = create_kwargs