From e646ed2dd95b569de31d029a3b01607a42d7af61 Mon Sep 17 00:00:00 2001 From: Martin Kutlak Date: Fri, 1 Nov 2019 16:21:11 +0100 Subject: [PATCH] retrace: Update retrace playbook with upstream changes Signed-off-by: Martin Kutlak --- roles/abrt/faf/defaults/main.yml | 2 +- roles/abrt/faf/meta/.galaxy_install_info | 2 +- roles/abrt/faf/tasks/check.yml | 4 +- roles/abrt/faf/tasks/check_web.yml | 10 +++-- roles/abrt/faf/tasks/cleanup.yml | 4 +- roles/abrt/faf/tasks/cron.yml | 47 +++++++++++--------- roles/abrt/faf/tasks/first_time_setup.yml | 1 + roles/abrt/retrace/meta/.galaxy_install_info | 2 +- roles/abrt/retrace/tasks/check.yml | 5 ++- roles/abrt/retrace/tasks/usefafpkgs.yml | 2 +- 10 files changed, 43 insertions(+), 36 deletions(-) diff --git a/roles/abrt/faf/defaults/main.yml b/roles/abrt/faf/defaults/main.yml index fdf9c8b59d..8af0cf461f 100644 --- a/roles/abrt/faf/defaults/main.yml +++ b/roles/abrt/faf/defaults/main.yml @@ -29,7 +29,7 @@ faf_cron_jobs: true # faf reachable on httpd root (http://hostname/) # if false it's (http://hostname/faf/) -faf_web_on_root: true +faf_web_on_root: false ########################### # faf configuration # diff --git a/roles/abrt/faf/meta/.galaxy_install_info b/roles/abrt/faf/meta/.galaxy_install_info index 80106456a8..2a6f60581f 100644 --- a/roles/abrt/faf/meta/.galaxy_install_info +++ b/roles/abrt/faf/meta/.galaxy_install_info @@ -1,2 +1,2 @@ -install_date: Thu Jul 4 13:16:07 2019 +install_date: Fri Nov 1 15:15:14 2019 version: el7 diff --git a/roles/abrt/faf/tasks/check.yml b/roles/abrt/faf/tasks/check.yml index b3914f410e..a10fd7bd05 100644 --- a/roles/abrt/faf/tasks/check.yml +++ b/roles/abrt/faf/tasks/check.yml @@ -3,7 +3,7 @@ # check backend functionality - name: faf - shell: faf "{{ item }}" + shell: faf {{ item }} become: yes become_user: faf loop: @@ -19,7 +19,7 @@ group: faf - name: faf - shell: faf "{{ item }}" + shell: faf {{ item }} become: yes become_user: faf loop: diff --git a/roles/abrt/faf/tasks/check_web.yml b/roles/abrt/faf/tasks/check_web.yml index affab21e06..0ca516d00f 100644 --- a/roles/abrt/faf/tasks/check_web.yml +++ b/roles/abrt/faf/tasks/check_web.yml @@ -6,24 +6,26 @@ problems_url: "https://{{ ansible_default_ipv4.address }}{{ url_suffix }}/problems/" - name: check main - local_action: - module: uri + uri: url: "{{ main_url }}" return_content: yes validate_certs: no register: uri_res + check_mode: no + delegate_to: localhost - fail: msg="{{ main_url }} doesn't contain 'FAF' string" when: "'FAF' not in uri_res.content" - name: fetch problems - local_action: - module: uri + uri: url: "{{ problems_url }}" return_content: yes validate_certs: no register: uri_res + check_mode: no + delegate_to: localhost - fail: msg="{{ main_url }} doesn't contain 'State' string" when: diff --git a/roles/abrt/faf/tasks/cleanup.yml b/roles/abrt/faf/tasks/cleanup.yml index 9741576605..9549d576cb 100644 --- a/roles/abrt/faf/tasks/cleanup.yml +++ b/roles/abrt/faf/tasks/cleanup.yml @@ -1,13 +1,13 @@ --- - name: remove EOLed opsys command: faf releasemod -o "{{ item.opsys|lower }}" --opsys-release "{{ item.release }}" -s EOL - loop: "{{eol_opsys|selectattr('opsys')|selectattr('release')|list}}" + loop: "{{ eol_opsys | selectattr('opsys') | selectattr('release') | list }}" become: yes become_user: faf - name: remove EOLed packages command: faf cleanup-packages "{{ item.opsys|capitalize }}" "{{ item.release }}" - loop: "{{eol_opsys|selectattr('opsys')|selectattr('release')|list}}" + loop: "{{ eol_opsys | selectattr('opsys') | selectattr('release') | list }}" become: yes become_user: faf diff --git a/roles/abrt/faf/tasks/cron.yml b/roles/abrt/faf/tasks/cron.yml index df23fe2f47..bfce4bf2dc 100644 --- a/roles/abrt/faf/tasks/cron.yml +++ b/roles/abrt/faf/tasks/cron.yml @@ -10,10 +10,10 @@ - name: cron create-problems-speedup cron: - name: "faf create-problems-speedup with type {{ item}}" + name: "faf create-problems-speedup with type {{ item }}" user: faf - job: "faf create-problems -p {{ item }} --speedup >> /var/log/faf/create-problems.log 2>&1" - minute: "30" + job: "faf create-problems -p {{ item }} --speedup --report-min-count 2 >> /var/log/faf/create-problems-{{ item }}.log 2>&1" + minute: "{{ 60 | random(seed=item) }}" hour: "2" state: present loop: @@ -21,12 +21,13 @@ - "kerneloops" - "python" - "ruby" + - "java" - name: cron create-problems cron: - name: "faf create-problems with type {{ item}}" + name: "faf create-problems with type {{ item }}" user: faf - job: "faf create-problems -p {{ item }} >> /var/log/faf/create-problems.log 2>&1" + job: "faf create-problems -p {{ item }} >> /var/log/faf/create-problems-{{ item }}.log 2>&1" day: "15" minute: "30" hour: "14" @@ -36,6 +37,7 @@ - "kerneloops" - "python" - "ruby" + - "java" - name: cron reposync cron: @@ -59,28 +61,27 @@ - { type: "core", day: "2,4,6" } - { type: "kerneloops", day: "1,3,5" } -- name: cron - faf find-crashfn core +- name: cron - faf find-crashfn cron: - name: "cron for faf find-crashfn for core" + name: "cron for faf find-crashfn for {{ item }}" user: faf - job: "faf find-crashfn -p core >> /var/log/faf/find-crashfn-core.log 2>&1" - special_time: daily - state: present - -- name: cron - faf find-crashfn kerneloops - cron: - name: "cron for faf find-crashfn for kerneloops" - user: faf - job: "faf find-crashfn -p kerneloops >> /var/log/faf/find-crashfn-kerneloops.log 2>&1" - special_time: daily + job: "faf find-crashfn -p {{ item }}" + minute: "{{ 60 | random(seed=item) }}" + hour: "5" state: present + loop: + - "core" + - "kerneloops" + - "python" + - "ruby" + - "java" - name: cron pull-releases cron: name: "faf pull-releases {{ item }}" user: faf job: "faf pull-releases -o {{ item }} >> /var/log/faf/pull-releases.log 2>&1" - minute: "55" + minute: "5" hour: "0" state: present loop: "{{ faf_opsys_list }}" @@ -90,8 +91,8 @@ name: "faf pull-components {{ item }}" user: faf job: "faf pull-components -o {{ item }} >> /var/log/faf/pull-components.log 2>&1" - minute: "55" - hour: "2" + minute: "5" + hour: "1" state: present loop: "{{ faf_opsys_list }}" @@ -100,7 +101,8 @@ name: "cron for faf find-components -o {{ item }}" user: faf job: "faf find-components -o {{ item }} >> /var/log/faf/find-components.log 2>&1" - special_time: daily + minute: "5" + hour: "2" state: present loop: "{{ faf_opsys_list }}" @@ -109,5 +111,6 @@ name: "cron for faf match-unknown-packages" user: faf job: "faf match-unknown-packages >> /var/log/faf/match-unknown-packages.log 2>&1" - special_time: daily + minute: "23" + hour: "22" state: present diff --git a/roles/abrt/faf/tasks/first_time_setup.yml b/roles/abrt/faf/tasks/first_time_setup.yml index 40e697abac..4d4fec8c4e 100644 --- a/roles/abrt/faf/tasks/first_time_setup.yml +++ b/roles/abrt/faf/tasks/first_time_setup.yml @@ -4,6 +4,7 @@ shell: psql -c "SELECT COUNT(*) FROM pg_stat_user_tables" register: count_tables changed_when: "( count_tables.stdout_lines[2]|int ) == 0" + check_mode: no become: yes become_user: faf diff --git a/roles/abrt/retrace/meta/.galaxy_install_info b/roles/abrt/retrace/meta/.galaxy_install_info index d2a88effe3..ce22ccfb62 100644 --- a/roles/abrt/retrace/meta/.galaxy_install_info +++ b/roles/abrt/retrace/meta/.galaxy_install_info @@ -1,2 +1,2 @@ -install_date: Thu Jul 4 13:16:08 2019 +install_date: Fri Nov 1 15:15:15 2019 version: el7 diff --git a/roles/abrt/retrace/tasks/check.yml b/roles/abrt/retrace/tasks/check.yml index 371bbefb56..514c9c8ff9 100644 --- a/roles/abrt/retrace/tasks/check.yml +++ b/roles/abrt/retrace/tasks/check.yml @@ -8,12 +8,13 @@ settings_url: "https://{{ ansible_default_ipv4.address }}/settings" - name: fetch settings - local_action: - module: uri + uri: url: "{{ settings_url }}" return_content: yes validate_certs: no register: uri_res + check_mode: no + delegate_to: localhost - fail: msg="{{ settings_url }} doesn't contain supported_releases" when: diff --git a/roles/abrt/retrace/tasks/usefafpkgs.yml b/roles/abrt/retrace/tasks/usefafpkgs.yml index a23817e524..7bee43a780 100644 --- a/roles/abrt/retrace/tasks/usefafpkgs.yml +++ b/roles/abrt/retrace/tasks/usefafpkgs.yml @@ -50,4 +50,4 @@ state: directory owner: retrace group: retrace - when: rsdir.stat.exists == False + when: not rsdir.stat.exists|bool