From 21ce5c69422f178d7e42f079c2bfa404a95277a5 Mon Sep 17 00:00:00 2001 From: Anton Podviaznikov Date: Mon, 12 Sep 2016 18:31:12 -0700 Subject: [PATCH 1/3] update khronos queues --- ansible/group_vars/alpha-khronos.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml index bf8bb659..f28aa91e 100644 --- a/ansible/group_vars/alpha-khronos.yml +++ b/ansible/group_vars/alpha-khronos.yml @@ -9,22 +9,22 @@ npm_version: 2 # for cron job # this is the list of queues we want to enqueue a job into main_cron_queues: "\ - khronos:containers:image-builder:prune \ - khronos:containers:orphan:prune \ - khronos:context-versions:prune-expired \ - khronos:images:prune \ - khronos:instances:cleanup \ - khronos:weave:prune" + containers.image-builder:prune \ + containers.orphan:prune \ + context-versions.prune-expired \ + images.prune \ + instances.cleanup \ + weave.prune" canary_cron_queues: "\ - khronos:canary:build \ - khronos:canary:github-branch \ - khronos:canary:log \ - khronos:canary:network \ - khronos:metrics:container-status" + canary.build \ + canary.github-branch \ + canary.log \ + canary.network \ + metrics.container-status" hourly_canary_cron_queues: "\ - khronos:canary:failover" + canary.failover" # a nice version of the rabbitmq host cron_rabbit_host_address: "{{ rabbit_host_address }}:{{ rabbit_port }}" From 0319319ab468a4e626cc74148e1e18c4348eebf5 Mon Sep 17 00:00:00 2001 From: Anton Podviaznikov Date: Tue, 13 Sep 2016 11:29:29 -0700 Subject: [PATCH 2/3] fix --- ansible/group_vars/alpha-khronos.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml index f28aa91e..c3ebaffa 100644 --- a/ansible/group_vars/alpha-khronos.yml +++ b/ansible/group_vars/alpha-khronos.yml @@ -9,8 +9,8 @@ npm_version: 2 # for cron job # this is the list of queues we want to enqueue a job into main_cron_queues: "\ - containers.image-builder:prune \ - containers.orphan:prune \ + containers.image-builder.prune \ + containers.orphan.prune \ context-versions.prune-expired \ images.prune \ instances.cleanup \ From 8ee86865368c9647cb9c58da2bf9a35b9ba156e9 Mon Sep 17 00:00:00 2001 From: Anton Podviaznikov Date: Tue, 13 Sep 2016 13:25:55 -0700 Subject: [PATCH 3/3] rename some tasks --- ansible/group_vars/alpha-khronos.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml index c3ebaffa..2ede31ee 100644 --- a/ansible/group_vars/alpha-khronos.yml +++ b/ansible/group_vars/alpha-khronos.yml @@ -17,14 +17,14 @@ main_cron_queues: "\ weave.prune" canary_cron_queues: "\ - canary.build \ - canary.github-branch \ - canary.log \ - canary.network \ + canary.build.run \ + canary.github-branch.run \ + canary.log.run \ + canary.network.run \ metrics.container-status" hourly_canary_cron_queues: "\ - canary.failover" + canary.failover.run" # a nice version of the rabbitmq host cron_rabbit_host_address: "{{ rabbit_host_address }}:{{ rabbit_port }}"