mirror of
https://github.com/ansible/awx.git
synced 2026-02-26 07:26:03 -03:30
Removing debug message and adding help details about empty groups
This commit is contained in:
@@ -181,6 +181,8 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin):
|
|||||||
"If enabled, the inventory will prevent adding any organization "
|
"If enabled, the inventory will prevent adding any organization "
|
||||||
"instance groups to the list of preferred instances groups to run "
|
"instance groups to the list of preferred instances groups to run "
|
||||||
"associated job templates on."
|
"associated job templates on."
|
||||||
|
"If this setting is enabled and you provided an empty list, the global instance "
|
||||||
|
"groups will be applied."
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -279,6 +279,8 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour
|
|||||||
help_text=(
|
help_text=(
|
||||||
"If enabled, the job template will prevent adding any inventory or organization "
|
"If enabled, the job template will prevent adding any inventory or organization "
|
||||||
"instance groups to the list of preferred instances groups to run on."
|
"instance groups to the list of preferred instances groups to run on."
|
||||||
|
"If this setting is enabled and you provided an empty list, the global instance "
|
||||||
|
"groups will be applied."
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -810,7 +812,6 @@ class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskMana
|
|||||||
for instance_group in getattr(self, obj_type).instance_groups.all():
|
for instance_group in getattr(self, obj_type).instance_groups.all():
|
||||||
selected_groups.append(instance_group)
|
selected_groups.append(instance_group)
|
||||||
if getattr(getattr(self, obj_type), 'prevent_instance_group_fallback', False):
|
if getattr(getattr(self, obj_type), 'prevent_instance_group_fallback', False):
|
||||||
logger.error("Breaking in preferred instance group at {}".format(obj_type))
|
|
||||||
break
|
break
|
||||||
if not selected_groups:
|
if not selected_groups:
|
||||||
return self.global_instance_groups
|
return self.global_instance_groups
|
||||||
|
|||||||
@@ -191,7 +191,8 @@ const getInventoryHelpTextStrings = () => ({
|
|||||||
sourcePath: t`The inventory file
|
sourcePath: t`The inventory file
|
||||||
to be synced by this source. You can select from
|
to be synced by this source. You can select from
|
||||||
the dropdown or enter a file within the input.`,
|
the dropdown or enter a file within the input.`,
|
||||||
preventInstanceGroupFallback: t`If enabled, the job template will prevent adding any inventory or organization instance groups to the list of preferred instances groups to run on.`,
|
preventInstanceGroupFallback: t`If enabled, the inventory will prevent adding any organization instance groups to the list of preferred instances groups to run associated job templates on.
|
||||||
|
Note: If this setting is enabled and you provided an empty list, the global instance groups will be applied.`,
|
||||||
});
|
});
|
||||||
|
|
||||||
export default getInventoryHelpTextStrings;
|
export default getInventoryHelpTextStrings;
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ const jtHelpTextStrings = () => ({
|
|||||||
privilegeEscalation: t`If enabled, run this playbook as an administrator.`,
|
privilegeEscalation: t`If enabled, run this playbook as an administrator.`,
|
||||||
enableWebhook: t`Enable webhook for this template.`,
|
enableWebhook: t`Enable webhook for this template.`,
|
||||||
concurrentJobs: t`If enabled, simultaneous runs of this job template will be allowed.`,
|
concurrentJobs: t`If enabled, simultaneous runs of this job template will be allowed.`,
|
||||||
preventInstanceGroupFallback: t`If enabled, the job template will prevent adding any inventory or organization instance groups to the list of preferred instances groups to run on.`,
|
preventInstanceGroupFallback: t`If enabled, the job template will prevent adding any inventory or organization instance groups to the list of preferred instances groups to run on.
|
||||||
|
Note: If this setting is enabled and you provided an empty list, the global instance groups will be applied.`,
|
||||||
enableFactStorage: t`If enabled, this will store gathered facts so they can be viewed at the host level. Facts are persisted and injected into the fact cache at runtime.`,
|
enableFactStorage: t`If enabled, this will store gathered facts so they can be viewed at the host level. Facts are persisted and injected into the fact cache at runtime.`,
|
||||||
enabledOptions: (
|
enabledOptions: (
|
||||||
<>
|
<>
|
||||||
|
|||||||
Reference in New Issue
Block a user