diff --git a/roles/abrt/faf-local/tasks/install.yml b/roles/abrt/faf-local/tasks/install.yml index b3d229cd1a..11316a7273 100644 --- a/roles/abrt/faf-local/tasks/install.yml +++ b/roles/abrt/faf-local/tasks/install.yml @@ -3,7 +3,7 @@ package: state: present name: - - python-psycopg2 + - python3-psycopg2 - postgresql-server - postgresql - pg-semver @@ -20,7 +20,7 @@ state: present name: - memcached - - python-memcached + - python3-memcached when: ansible_distribution == "RedHat" and faf_web_cache_type == "memcached" - name: memcached fedora @@ -30,5 +30,5 @@ - libmemcached - memcached - zlib - - python-pylibmc + - python3-pylibmc when: ansible_distribution == "Fedora" and faf_web_cache_type == "memcached" diff --git a/roles/abrt/faf-local/tasks/main.yml b/roles/abrt/faf-local/tasks/main.yml index 617544bc6e..07ff3ff8ba 100644 --- a/roles/abrt/faf-local/tasks/main.yml +++ b/roles/abrt/faf-local/tasks/main.yml @@ -16,49 +16,49 @@ - name: configure ADMINS lineinfile: - dest: /usr/lib/python2.7/site-packages/abrt-server-info-page/config.py + dest: /usr/lib/python3.6/site-packages/abrt-server-info-page/config.py regexp: 'ADMINS =' line: ' ADMINS = "infrastructure@lists.fedoraproject.org"' notify: restart httpd - name: configure MORE_FAF lineinfile: - dest: /usr/lib/python2.7/site-packages/abrt-server-info-page/config.py + dest: /usr/lib/python3.6/site-packages/abrt-server-info-page/config.py regexp: 'MORE_FAF =' line: ' MORE_FAF = "https://github.com/abrt/faf/"' notify: restart httpd - name: configure MORE_RS lineinfile: - dest: /usr/lib/python2.7/site-packages/abrt-server-info-page/config.py + dest: /usr/lib/python3.6/site-packages/abrt-server-info-page/config.py regexp: 'MORE_RS =' line: ' MORE_RS = "https://github.com/abrt/retrace-server"' notify: restart httpd - name: configure MORE_ABRT lineinfile: - dest: /usr/lib/python2.7/site-packages/abrt-server-info-page/config.py + dest: /usr/lib/python3.6/site-packages/abrt-server-info-page/config.py regexp: 'MORE_ABRT =' line: ' MORE_ABRT = "https://github.com/abrt/abrt/"' notify: restart httpd - name: configure MORE_GABRT lineinfile: - dest: /usr/lib/python2.7/site-packages/abrt-server-info-page/config.py + dest: /usr/lib/python3.6/site-packages/abrt-server-info-page/config.py regexp: 'MORE_GABRT =' line: ' MORE_GABRT = "https://github.com/abrt/gnome-abrt/"' notify: restart httpd - name: configure MORE_LR lineinfile: - dest: /usr/lib/python2.7/site-packages/abrt-server-info-page/config.py + dest: /usr/lib/python3.6/site-packages/abrt-server-info-page/config.py regexp: 'MORE_LR =' line: ' MORE_LR = "https://github.com/abrt/libreport/"' notify: restart httpd - name: configure MORE_SATYR lineinfile: - dest: /usr/lib/python2.7/site-packages/abrt-server-info-page/config.py + dest: /usr/lib/python3.6/site-packages/abrt-server-info-page/config.py regexp: 'MORE_SATYR =' line: ' MORE_SATYR = "https://github.com/abrt/satyr/"' notify: restart httpd diff --git a/roles/abrt/faf/defaults/main.yml b/roles/abrt/faf/defaults/main.yml index 8af0cf461f..cbfcb50043 100644 --- a/roles/abrt/faf/defaults/main.yml +++ b/roles/abrt/faf/defaults/main.yml @@ -88,8 +88,8 @@ domain: example.org # the URL can be also with /path part (e.g. example-faf.org/faf) faf_server_name: "example-faf.org" -faf_web_brand_title: "FAF" -faf_web_brand_subtitle: "Fedora Analysis Framework" +faf_web_brand_title: "ABRT" +faf_web_brand_subtitle: "Analysis" faf_web_fedmenu_url: # https://apps.fedoraproject.org/fedmenu @@ -162,7 +162,7 @@ faf_opsys_list: faf_packages: - faf - faf-migrations - - faf-yum + - faf-dnf faf_problem_packages: - faf-problem-coredump diff --git a/roles/abrt/faf/files/group_abrt-faf-el7-epel-7.repo b/roles/abrt/faf/files/group_abrt-faf-el7-epel-7.repo deleted file mode 100644 index ec4e5fa897..0000000000 --- a/roles/abrt/faf/files/group_abrt-faf-el7-epel-7.repo +++ /dev/null @@ -1,10 +0,0 @@ -[group_abrt-faf-el7] -name=Copr repo for faf-el7 owned by @abrt -baseurl=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el7/epel-7-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el7/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 diff --git a/roles/abrt/faf/files/group_abrt-faf-el8-epel-8.repo b/roles/abrt/faf/files/group_abrt-faf-el8-epel-8.repo new file mode 100644 index 0000000000..526f31f34f --- /dev/null +++ b/roles/abrt/faf/files/group_abrt-faf-el8-epel-8.repo @@ -0,0 +1,21 @@ +[faf-el8] +name=Copr repo for faf-el8 owned by @abrt +baseurl=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el8/epel-8-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el8/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 + +[faf-el8-required-packages] +name=Copr repo for faf-el8-required-packages owned by @abrt +baseurl=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el8-required-packages/epel-8-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/@abrt/faf-el8-required-packages/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 diff --git a/roles/abrt/faf/meta/.galaxy_install_info b/roles/abrt/faf/meta/.galaxy_install_info index 2a6f60581f..14d8211093 100644 --- a/roles/abrt/faf/meta/.galaxy_install_info +++ b/roles/abrt/faf/meta/.galaxy_install_info @@ -1,2 +1,2 @@ -install_date: Fri Nov 1 15:15:14 2019 -version: el7 +install_date: Tue Jan 21 10:21:03 2020 +version: master diff --git a/roles/abrt/faf/tasks/celery.yml b/roles/abrt/faf/tasks/celery.yml index 0faba5ed0a..c66a1e3435 100644 --- a/roles/abrt/faf/tasks/celery.yml +++ b/roles/abrt/faf/tasks/celery.yml @@ -9,7 +9,7 @@ package: name: - redis - - python-redis + - python3-redis state: present tags: - packages diff --git a/roles/abrt/faf/tasks/check_web.yml b/roles/abrt/faf/tasks/check_web.yml index 0ca516d00f..9752d4675f 100644 --- a/roles/abrt/faf/tasks/check_web.yml +++ b/roles/abrt/faf/tasks/check_web.yml @@ -14,9 +14,9 @@ check_mode: no delegate_to: localhost -- fail: msg="{{ main_url }} doesn't contain 'FAF' string" +- fail: msg="{{ main_url }} doesn't contain 'ABRT' string" when: - "'FAF' not in uri_res.content" + "'ABRT' not in uri_res.content" - name: fetch problems uri: diff --git a/roles/abrt/faf/tasks/cleanup.yml b/roles/abrt/faf/tasks/cleanup.yml index 9549d576cb..335d10d308 100644 --- a/roles/abrt/faf/tasks/cleanup.yml +++ b/roles/abrt/faf/tasks/cleanup.yml @@ -1,12 +1,12 @@ --- - name: remove EOLed opsys - command: faf releasemod -o "{{ item.opsys|lower }}" --opsys-release "{{ item.release }}" -s EOL + command: faf releasemod -o "{{ item.opsys | lower }}" --opsys-release "{{ item.release }}" -s EOL 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 }}" + command: faf cleanup-packages "{{ item.opsys | capitalize }}" "{{ item.release }}" loop: "{{ eol_opsys | selectattr('opsys') | selectattr('release') | list }}" become: yes become_user: faf diff --git a/roles/abrt/faf/tasks/install.yml b/roles/abrt/faf/tasks/install.yml index 0db23e0825..550b65aee1 100644 --- a/roles/abrt/faf/tasks/install.yml +++ b/roles/abrt/faf/tasks/install.yml @@ -2,7 +2,7 @@ - name: enable Copr repo for RHEL copy: - src: group_abrt-faf-el7-epel-7.repo + src: group_abrt-faf-el8-epel-8.repo dest: /etc/yum.repos.d/ when: ansible_distribution == 'RedHat' diff --git a/roles/abrt/faf/templates/etc-httpd-conf.d-faf-web.conf.j2 b/roles/abrt/faf/templates/etc-httpd-conf.d-faf-web.conf.j2 index 333ee413ea..4922ad41ab 100644 --- a/roles/abrt/faf/templates/etc-httpd-conf.d-faf-web.conf.j2 +++ b/roles/abrt/faf/templates/etc-httpd-conf.d-faf-web.conf.j2 @@ -4,7 +4,7 @@ WSGIPythonOptimize 1 WSGISocketPrefix {{ faf_spool_dir }}/wsgi WSGIDaemonProcess faf user=faf group=faf processes=3 threads=5 -{% set python = 'python2.7' %} +{% set python = 'python3.6' %} WSGIScriptAlias /{{ url_suffix }} /usr/lib/{{ python }}/site-packages/webfaf/hub.wsgi process-group=faf application-group=%{GLOBAL} diff --git a/roles/abrt/requirements.yml b/roles/abrt/requirements.yml index 465186d8c5..bde7bf9f1b 100644 --- a/roles/abrt/requirements.yml +++ b/roles/abrt/requirements.yml @@ -1,8 +1,8 @@ # Install a role from GitHub - name: faf src: https://github.com/abrt/ansible-role-faf.git - version: el7 + version: master - name: retrace src: https://github.com/abrt/ansible-role-retrace-server.git - version: el7 + version: master diff --git a/roles/abrt/retrace/meta/.galaxy_install_info b/roles/abrt/retrace/meta/.galaxy_install_info index ce22ccfb62..f2972203e0 100644 --- a/roles/abrt/retrace/meta/.galaxy_install_info +++ b/roles/abrt/retrace/meta/.galaxy_install_info @@ -1,2 +1,2 @@ -install_date: Fri Nov 1 15:15:15 2019 -version: el7 +install_date: Tue Jan 21 10:21:04 2020 +version: master