From 7e0fdbef1524dbbbfac5607c8e7ef80ce6629589 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 27 Sep 2019 12:42:31 +0200 Subject: [PATCH] Koschei: Move cron jobs to vars --- playbooks/openshift-apps/koschei.yml | 5 +---- roles/openshift-apps/koschei/vars/production.yml | 5 +++++ roles/openshift-apps/koschei/vars/staging.yml | 5 +++++ 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/playbooks/openshift-apps/koschei.yml b/playbooks/openshift-apps/koschei.yml index 1fdf15bb96..489beb07fb 100644 --- a/playbooks/openshift-apps/koschei.yml +++ b/playbooks/openshift-apps/koschei.yml @@ -66,9 +66,6 @@ name: "{{ item.name }}" schedule: "{{ item.schedule }}" command: "{{ item.command }}" - with_items: - - name: db-cleanup - schedule: "0 3 * * *" - command: "koschei-admin cleanup --older-than 6" + with_items: "{{ koschei_cron_jobs }}" loop_control: label: "{{ item.name }}" diff --git a/roles/openshift-apps/koschei/vars/production.yml b/roles/openshift-apps/koschei/vars/production.yml index 145476a4d7..8497f5c16f 100644 --- a/roles/openshift-apps/koschei/vars/production.yml +++ b/roles/openshift-apps/koschei/vars/production.yml @@ -20,3 +20,8 @@ koschei_backend_services: - { name: build-resolver, cpu: [ 1000, 1500 ], memory: [ 1024, 4096 ] } - { name: repo-resolver, cpu: [ 2000, 8000 ], memory: [ 1024, 4096 ] } - { name: watcher, cpu: [ 1000, 1500 ], memory: [ 256, 512 ] } + +koschei_cron_jobs: + - name: db-cleanup + schedule: "0 3 * * *" + command: "koschei-admin cleanup --older-than 6" diff --git a/roles/openshift-apps/koschei/vars/staging.yml b/roles/openshift-apps/koschei/vars/staging.yml index ca1a71d33c..4a4bec009a 100644 --- a/roles/openshift-apps/koschei/vars/staging.yml +++ b/roles/openshift-apps/koschei/vars/staging.yml @@ -22,3 +22,8 @@ koschei_backend_services: - { name: build-resolver, cpu: [ 1000, 1500 ], memory: [ 1024, 4096 ] } - { name: repo-resolver, cpu: [ 2000, 8000 ], memory: [ 1024, 4096 ] } - { name: watcher, cpu: [ 1000, 1500 ], memory: [ 256, 512 ] } + +koschei_cron_jobs: + - name: db-cleanup + schedule: "0 3 * * *" + command: "koschei-admin cleanup --older-than 6"