diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index fdf3272f99..30e50db1ea 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -181,6 +181,8 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin, RelatedJobsMixin): "If enabled, the inventory will prevent adding any organization " "instance groups to the list of preferred instances groups to run " "associated job templates on." + "If this setting is enabled and you provided an empty list, the global instance " + "groups will be applied." ), ) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index a9c6cf6907..f5c5941914 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -279,6 +279,8 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour 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." + "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(): 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 diff --git a/awx/ui/src/screens/Inventory/shared/Inventory.helptext.js b/awx/ui/src/screens/Inventory/shared/Inventory.helptext.js index 564add096d..43b231bfd6 100644 --- a/awx/ui/src/screens/Inventory/shared/Inventory.helptext.js +++ b/awx/ui/src/screens/Inventory/shared/Inventory.helptext.js @@ -191,7 +191,8 @@ const getInventoryHelpTextStrings = () => ({ sourcePath: t`The inventory file to be synced by this source. You can select from 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; diff --git a/awx/ui/src/screens/Template/shared/JobTemplate.helptext.js b/awx/ui/src/screens/Template/shared/JobTemplate.helptext.js index b68ba02204..8aa8b48db3 100644 --- a/awx/ui/src/screens/Template/shared/JobTemplate.helptext.js +++ b/awx/ui/src/screens/Template/shared/JobTemplate.helptext.js @@ -30,7 +30,8 @@ const jtHelpTextStrings = () => ({ privilegeEscalation: t`If enabled, run this playbook as an administrator.`, enableWebhook: t`Enable webhook for this template.`, 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.`, enabledOptions: ( <>