From a10880fc139e8e231bdb5f109d6472393f040783 Mon Sep 17 00:00:00 2001 From: Klaas Demter Date: Fri, 12 May 2023 15:39:00 +0200 Subject: [PATCH] Controller Schedule: forks, timeout and limit can only be set if template is configured as "prompt on launch" --- roles/schedules/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/schedules/tasks/main.yml b/roles/schedules/tasks/main.yml index 654254b23..3a91e9ef1 100644 --- a/roles/schedules/tasks/main.yml +++ b/roles/schedules/tasks/main.yml @@ -10,15 +10,15 @@ credentials: "{{ __controller_schedule_item.credentials | default(omit, true) }}" scm_branch: "{{ __controller_schedule_item.scm_branch | default(( '' if controller_configuration_schedules_enforce_defaults else omit), true) }}" execution_environment: "{{ __controller_schedule_item.execution_environment.name | default(__controller_schedule_item.execution_environment | default(( '' if controller_configuration_schedules_enforce_defaults else omit), true)) }}" - forks: "{{ __controller_schedule_item.forks | default(( 0 if controller_configuration_schedules_enforce_defaults else omit), true) }}" + forks: "{{ __controller_schedule_item.forks | default(omit, true) }}" instance_groups: "{{ __controller_schedule_item.instance_groups | default(omit, true) }}" job_slice_count: "{{ __controller_schedule_item.job_slice_count | default(( 1 if controller_configuration_schedules_enforce_defaults else omit), true) }}" labels: "{{ (__controller_schedule_item.related.labels | map(attribute='name') | list if __controller_schedule_item.related.labels is defined else '') | default(__controller_schedule_item.labels) | default(( [] if controller_configuration_schedules_enforce_defaults else omit), true) }}" - timeout: "{{ __controller_schedule_item.timeout | default(( 0 if controller_configuration_schedules_enforce_defaults else omit), true) }}" + timeout: "{{ __controller_schedule_item.timeout | default(omit, true) }}" job_type: "{{ __controller_schedule_item.job_type | default(omit, true) }}" job_tags: "{{ __controller_schedule_item.job_tags | default(( '' if controller_configuration_schedules_enforce_defaults else omit), true) }}" skip_tags: "{{ __controller_schedule_item.skip_tags | default(( '' if controller_configuration_schedules_enforce_defaults else omit), true) }}" - limit: "{{ __controller_schedule_item.limit | default(( '' if controller_configuration_schedules_enforce_defaults else omit), true) }}" + limit: "{{ __controller_schedule_item.limit | default(omit, true) }}" diff_mode: "{{ __controller_schedule_item.diff_mode | default(( false if controller_configuration_schedules_enforce_defaults else omit)) }}" verbosity: "{{ __controller_schedule_item.verbosity | default(omit, true) }}" organization: "{{ __controller_schedule_item.organization | default(( '' if controller_configuration_schedules_enforce_defaults else omit), true) }}"