From a7f1e69352502f14156f957040b219d8d9076936 Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Fri, 25 Sep 2015 14:17:31 -0400 Subject: [PATCH] Fix an issue with default schedules These weren't being created correctly, the logic meant an extra schedule would be created on cleanup facts erroneously selected to be cleanup activity stream --- awx/main/migrations/0071_v240_changes.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/awx/main/migrations/0071_v240_changes.py b/awx/main/migrations/0071_v240_changes.py index 28cebbb7be..b36060b725 100644 --- a/awx/main/migrations/0071_v240_changes.py +++ b/awx/main/migrations/0071_v240_changes.py @@ -16,16 +16,17 @@ class Migration(DataMigration): if stj.name == "Cleanup Job Details": sched = orm.Schedule(name="Cleanup Job Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU" % nowtime, description="Automatically Generated Schedule", enabled=True, extra_data={"days": "120"}) - if stj.name == "Cleanup Deleted Data": + elif stj.name == "Cleanup Deleted Data": sched = orm.Schedule(name="Cleanup Deleted Data Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO" % nowtime, description="Automatically Generated Schedule", enabled=True, extra_data={"days": "30"}) - if stj.name == "Cleanup Activity Stream": + elif stj.name == "Cleanup Activity Stream": sched = orm.Schedule(name="Cleanup Activity Schedule", rrule="DTSTART:%s RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU" % nowtime, description="Automatically Generated Schedule", enabled=True, extra_data={"days": "355"}) - if feature_enabled('system_tracking'): - if stj.name == "Cleanup Fact Details": - sched = orm.Schedule(name="Cleanup Fact Schedule", rrule="DTSTART:%s RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=1" % nowtime, - description="Automatically Generated Schedule", enabled=True, extra_data={'older_than': '120d', 'granularity': '1w'}) + elif stj.name == "Cleanup Fact Details" and feature_enabled('system_tracking'): + sched = orm.Schedule(name="Cleanup Fact Schedule", rrule="DTSTART:%s RRULE:FREQ=MONTHLY;INTERVAL=1;BYMONTHDAY=1" % nowtime, + description="Automatically Generated Schedule", enabled=True, extra_data={'older_than': '120d', 'granularity': '1w'}) + else: + continue sched.unified_job_template = stj sched.created = nowtime_actual sched.modified = nowtime_actual