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

Merge branch 'downstream' into devel

Browse Source
This commit is contained in:
Ryan Petrello
2020-05-05 20:12:24 -04:00
parent de8c37fd3d 961c5589c1
commit e7e716742a
10 changed files with 42 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/inventory.py
View File

@@ -2491,8 +2491,9 @@ class rhv(PluginFileInjector):
"""
plugin_name = 'ovirt'
base_injector = 'template'
initial_version = '2.9'
namespace = 'ovirt'
collection = 'ovirt_collection'
collection = 'ovirt'
@property
def script_name(self):

4
awx/main/models/unified_jobs.py
View File

@@ -150,7 +150,7 @@ class UnifiedJobTemplate(PolymorphicModel, CommonModelNameNotUnique, Notificatio
default=None,
editable=False,
related_name='%(class)s_as_next_schedule+',
on_delete=models.SET_NULL,
on_delete=polymorphic.SET_NULL,
)
status = models.CharField(
max_length=32,
@@ -586,7 +586,7 @@ class UnifiedJob(PolymorphicModel, PasswordFieldsModel, CommonModelNameNotUnique
null=True,
default=None,
editable=False,
on_delete=models.SET_NULL,
on_delete=polymorphic.SET_NULL,
)
dependent_jobs = models.ManyToManyField(
'self',