From 3916b6658603c4b3b74848c9a53e87d94727c5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 20 Apr 2017 12:55:27 +0200 Subject: [PATCH] retrace: use different condition --- inventory/group_vars/retrace | 2 ++ inventory/host_vars/faf01.stg.phx2.fedoraproject.org | 2 ++ inventory/host_vars/retrace01.stg.phx2.fedoraproject.org | 2 ++ roles/abrt/retrace-local/tasks/cron.yml | 6 +++--- roles/abrt/retrace-local/tasks/retrace_setup.yml | 4 ++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/inventory/group_vars/retrace b/inventory/group_vars/retrace index a06bace8a8..e0931528c2 100644 --- a/inventory/group_vars/retrace +++ b/inventory/group_vars/retrace @@ -13,6 +13,8 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.78.11 --dport 2049 -j ACCEPT', nrpe_procs_warn: 1800 nrpe_procs_crit: 2000 +devel: false + # Since retrace is on the qa network, it needs to actively connect to our # inbound relay. fedmsg_active: True diff --git a/inventory/host_vars/faf01.stg.phx2.fedoraproject.org b/inventory/host_vars/faf01.stg.phx2.fedoraproject.org index 12f20c94fb..819e65cec0 100644 --- a/inventory/host_vars/faf01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/faf01.stg.phx2.fedoraproject.org @@ -12,3 +12,5 @@ datacenter: phx2 mem_size: 4096 max_mem_size: 16384 num_cpus: 2 + +devel: true diff --git a/inventory/host_vars/retrace01.stg.phx2.fedoraproject.org b/inventory/host_vars/retrace01.stg.phx2.fedoraproject.org index 14a014d4a9..c4d17343d5 100644 --- a/inventory/host_vars/retrace01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/retrace01.stg.phx2.fedoraproject.org @@ -19,3 +19,5 @@ rs_use_faf_packages: false # we do not have enough storage on stg rs_internal_fedora_vers: [rawhide] rs_internal_arch_list: [x86_64] + +devel: true diff --git a/roles/abrt/retrace-local/tasks/cron.yml b/roles/abrt/retrace-local/tasks/cron.yml index e7375a2629..00c080a789 100644 --- a/roles/abrt/retrace-local/tasks/cron.yml +++ b/roles/abrt/retrace-local/tasks/cron.yml @@ -10,7 +10,7 @@ - "{{ rs_internal_arch_list }}" special_time: daily state: present - when: deployment_type != 'stg' + when: not devel - name: Create cron job for retrace-server cron: @@ -19,7 +19,7 @@ job: "retrace-server-reposync centos 7 x86_64 >> /var/log/retrace-server/reposync_error.log 2>&1" special_time: daily state: present - when: deployment_type != 'stg' + when: not devel - name: Create cron job for retrace-server cron: @@ -28,4 +28,4 @@ job: "/usr/bin/retrace-server-cleanup >> /var/log/retrace-server/cleanup_error.log 2>&1" special_time: daily state: present - when: deployment_type != 'stg' + when: not devel diff --git a/roles/abrt/retrace-local/tasks/retrace_setup.yml b/roles/abrt/retrace-local/tasks/retrace_setup.yml index b7329aad6b..bab02341d5 100644 --- a/roles/abrt/retrace-local/tasks/retrace_setup.yml +++ b/roles/abrt/retrace-local/tasks/retrace_setup.yml @@ -8,14 +8,14 @@ become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: deployment_type != 'stg' + when: not devel - name: reposync for centos command: retrace-server-reposync centos 7 x86_64 become: yes become_user: retrace tags: [rs_reposync, rs_fedora] - when: deployment_type != 'stg' + when: not devel - file: path: /srv/retrace/repos