Merge branch 'redhat-cop:devel' into devel

redhat-cop · Apr 27, 2023 · 68e5366 · 68e5366
2 parents 4d3f019 + 036d9a2
commit 68e5366
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/changelogs/fragments/rrule_bugfix.yml b/changelogs/fragments/rrule_bugfix.yml
@@ -0,0 +1,4 @@
+---
+bugfixes:
+  - Fixed rrule in schedules to not be mandatory.
+...
diff --git a/roles/schedules/tasks/main.yml b/roles/schedules/tasks/main.yml
@@ -4,7 +4,7 @@
     name:                           "{{ __controller_schedule_item.name | mandatory }}"
     new_name:                       "{{ __controller_schedule_item.new_name | default(omit, true) }}"
     description:                    "{{ __controller_schedule_item.description | default(lookup('infra.controller_configuration.enforce_defaults', enforce_default=controller_configuration_schedules_enforce_defaults , default_value='', omit_value=omit), true) }}"
-    rrule:                          "{{ __controller_schedule_item.rrule | mandatory }}"
+    rrule:                          "{{ __controller_schedule_item.rrule | default(lookup('infra.controller_configuration.enforce_defaults', enforce_default=controller_configuration_schedules_enforce_defaults , default_value='', omit_value=omit), true) }}"
     extra_data:                     "{{ __controller_schedule_item.extra_data | default(lookup('infra.controller_configuration.enforce_defaults', enforce_default=controller_configuration_schedules_enforce_defaults , default_value={}, omit_value=omit), true) }}"
     inventory:                      "{{ __controller_schedule_item.inventory | default(lookup('infra.controller_configuration.enforce_defaults', enforce_default=controller_configuration_schedules_enforce_defaults , default_value='', omit_value=omit), true) }}"
     credentials:                    "{{ __controller_schedule_item.credentials | default(omit, true) }}"