mirror of
https://github.com/ansible/awx.git
synced 2026-05-17 14:27:42 -02:30
Adding prevent_instance_group_fallback
This commit is contained in:
@@ -175,6 +175,13 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
|
||||
related_name='inventory_labels',
|
||||
help_text=_('Labels associated with this inventory.'),
|
||||
)
|
||||
prevent_instance_group_fallback = models.BooleanField(
|
||||
default=False,
|
||||
help_text=(
|
||||
"If enabled, the job template will prevent adding any inventory or organization "
|
||||
"instance groups to the list of preferred instances groups to run on."
|
||||
),
|
||||
)
|
||||
|
||||
def get_absolute_url(self, request=None):
|
||||
return reverse('api:inventory_detail', kwargs={'pk': self.pk}, request=request)
|
||||
|
||||
@@ -274,6 +274,13 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
|
||||
'admin_role',
|
||||
],
|
||||
)
|
||||
prevent_instance_group_fallback = models.BooleanField(
|
||||
default=False,
|
||||
help_text=(
|
||||
"If enabled, the job template will prevent adding any inventory or organization "
|
||||
"instance groups to the list of preferred instances groups to run on."
|
||||
),
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def _get_unified_job_class(cls):
|
||||
@@ -797,19 +804,14 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
|
||||
def preferred_instance_groups(self):
|
||||
# If the user specified instance groups those will be handled by the unified_job.create_unified_job
|
||||
# This function handles only the defaults for a template w/o user specification
|
||||
if self.organization is not None:
|
||||
organization_groups = [x for x in self.organization.instance_groups.all()]
|
||||
else:
|
||||
organization_groups = []
|
||||
if self.inventory is not None:
|
||||
inventory_groups = [x for x in self.inventory.instance_groups.all()]
|
||||
else:
|
||||
inventory_groups = []
|
||||
if self.job_template is not None:
|
||||
template_groups = [x for x in self.job_template.instance_groups.all()]
|
||||
else:
|
||||
template_groups = []
|
||||
selected_groups = template_groups + inventory_groups + organization_groups
|
||||
selected_groups = []
|
||||
for obj_type in ['job_template', 'inventory', 'organization']:
|
||||
if getattr(self, obj_type) is not None:
|
||||
for instance_group in getattr(self, obj_type).instance_groups.all():
|
||||
selected_groups.append(instance_group)
|
||||
if getattr(getattr(self, obj_type), 'prevent_instance_group_fallback', False):
|
||||
logger.error("Breaking in preferred instance group at {}".format(obj_type))
|
||||
break
|
||||
if not selected_groups:
|
||||
return self.global_instance_groups
|
||||
return selected_groups
|
||||
|
||||
Reference in New Issue
Block a user