Bug fixes

Author: anfimovdm

alts/shared/models.py

@@ -318,10 +318,6 @@ def __init__(self, **data):
         'kernel',
         'dnf',
     ]
-    force_install_pkgs: List[str] = [
-        'systemd-standalone-sysusers',
-        'systemd-standalone-tmpfiles',
-    ]
     keepalive_interval: int = 30  # unit in seconds
     commands_exec_timeout: int = 30  # unit in seconds
     provision_timeout: int = 1200  # 20 minutes in seconds

alts/worker/runners/base.py

@@ -876,13 +876,10 @@ def install_package_no_log(
             package_version=package_version,
             package_epoch=package_epoch,
         )
-        force_install = package_name in CONFIG.force_install_pkgs
-
         self._logger.info(
-            'Installing %s on %s...%s',
+            'Installing %s on %s...',
             full_pkg_name,
             self.env_name,
-            ' (force install due to known conflicts)' if force_install else '',
         )
         cmd_args = [
             '-i',
@@ -894,8 +891,6 @@ def install_package_no_log(
             f'pkg_version={package_version}',
             '-e',
             f'dist_name={dist_name}',
-            '-e',
-            f'force_install={force_install}',
         ]
         if module_name and module_stream and module_version:
             cmd_args.extend([

resources/roles/install_uninstall/defaults/main.yml

@@ -0,0 +1,6 @@
+---
+dnf_download_utils_pkg: "dnf-utils"
+yum_download_utils_pkg: "yum-utils"
+force_install_pkgs:
+  - "systemd-standalone-sysusers"
+  - "systemd-standalone-tmpfiles"

resources/roles/install_uninstall/tasks/main.yml

@@ -18,6 +18,7 @@
     is_ea_apache24_mod_lsapi: "{{ pkg_name.startswith('ea-apache24-mod-lsapi') }}"
     is_ea_apache24_mod_cgid: "{{ pkg_name.startswith('ea-apache24-mod_cgid') }}"
     is_ea_apache24_mod_http2: "{{ pkg_name.startswith('ea-apache24-mod_http2') }}"
+    force_install: "{{ force_install_pkgs | select('in', pkg_name) | list | length > 0 }}"
     dnf_args: "{{ default_dnf_args | combine(extra_dnf_args) }}"
     apt_args:
       allow_unauthenticated: true
@@ -118,14 +119,24 @@
   args: "{{ dnf_args }}"
   when:
     - ansible_facts.os_family == 'RedHat'
-    - not (force_install | default(false) | bool)
+    - not (force_install | bool)
+  tags:
+    - install_package
+
+- name: Ensure download utilities are installed
+  ansible.builtin.package:
+    name: "{{ yum_download_utils_pkg if ansible_facts.distribution_major_version | int <= 7 else dnf_download_utils_pkg }}"
+    state: present
+  when:
+    - ansible_facts.os_family == 'RedHat'
+    - force_install | bool
   tags:
     - install_package
 
 - name: Force install RPM package (bypass conflicts)
   when:
     - ansible_facts.os_family == 'RedHat'
-    - force_install | default(false) | bool
+    - force_install | bool
   tags:
     - install_package
   block:
@@ -136,7 +147,11 @@
 
     - name: Download RPM package
       ansible.builtin.shell:
-        cmd: "dnf download --destdir=/tmp/force_install {{ pkg_name }}"
+        cmd: >-
+          {{ 'yumdownloader --destdir=/tmp/force_install'
+          if ansible_facts.distribution_major_version | int <= 7
+          else 'dnf download --destdir=/tmp/force_install' }}
+          {{ pkg_name }}
 
     - name: Install downloaded RPM bypassing conflicts
       ansible.builtin.shell: