From 25b85c4a0bafb4d7d376bb523d80cfc9db461701 Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Tue, 1 Nov 2016 14:07:00 -0500 Subject: [PATCH] rename scheduler config singleton --- awx/main/migrations/0047_v310_tower_state.py | 2 +- awx/main/models/ha.py | 4 ++-- awx/main/tasks.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/awx/main/migrations/0047_v310_tower_state.py b/awx/main/migrations/0047_v310_tower_state.py index f1227830a4..941dfd0ba2 100644 --- a/awx/main/migrations/0047_v310_tower_state.py +++ b/awx/main/migrations/0047_v310_tower_state.py @@ -12,7 +12,7 @@ class Migration(migrations.Migration): operations = [ migrations.CreateModel( - name='TowerState', + name='TowerScheduleState', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('schedule_last_run', models.DateTimeField(auto_now_add=True)), diff --git a/awx/main/models/ha.py b/awx/main/models/ha.py index 818233672b..691faf6305 100644 --- a/awx/main/models/ha.py +++ b/awx/main/models/ha.py @@ -13,7 +13,7 @@ from awx.main.models.jobs import Job from awx.main.models.projects import ProjectUpdate from awx.main.models.unified_jobs import UnifiedJob -__all__ = ('Instance', 'JobOrigin', 'TowerState',) +__all__ = ('Instance', 'JobOrigin', 'TowerScheduleState',) class Instance(models.Model): @@ -35,7 +35,7 @@ class Instance(models.Model): # NOTE: TODO: Likely to repurpose this once standalone ramparts are a thing return "tower" -class TowerState(SingletonModel): +class TowerScheduleState(SingletonModel): schedule_last_run = models.DateTimeField(auto_now_add=True) class JobOrigin(models.Model): diff --git a/awx/main/tasks.py b/awx/main/tasks.py index b6448e3761..7f187c7bce 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -137,7 +137,7 @@ def cluster_node_heartbeat(self): @task(bind=True, queue='default') def tower_periodic_scheduler(self): run_now = now() - state = TowerState.get_solo() + state = TowerScheduleState.get_solo() last_run = state.schedule_last_run logger.debug("Last run was: %s", last_run) state.schedule_last_run = run_now