From cb0457f1a803ec12e60566e00b8088424081fed6 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@golov.de>
Date: Thu, 23 Jun 2022 16:44:30 +0200
Subject: [PATCH] BZ#2100578 - enable the satellite module for el8

---
 roles/satellite-clone/defaults/main.yml |  1 +
 roles/satellite-clone/tasks/main.yml    | 30 +++++++------------------
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/roles/satellite-clone/defaults/main.yml b/roles/satellite-clone/defaults/main.yml
index 1b6f6ff..13924fd 100644
--- a/roles/satellite-clone/defaults/main.yml
+++ b/roles/satellite-clone/defaults/main.yml
@@ -3,6 +3,7 @@
 backup_dir: /backup
 satellite_installer_cmd: satellite-installer
 satellite_package: satellite
+satellite_module: satellite
 satellite_scenario: satellite
 config_files_path: "{{ backup_dir }}/config_files.tar.gz"
 disable_firewall: False
diff --git a/roles/satellite-clone/tasks/main.yml b/roles/satellite-clone/tasks/main.yml
index e412adc..619d2e6 100644
--- a/roles/satellite-clone/tasks/main.yml
+++ b/roles/satellite-clone/tasks/main.yml
@@ -116,29 +116,15 @@
 
 # Install Satellite packages
 
-- when:
+- name: Enable {{ satellite_module }}:el8 module
+  command: dnf module enable -y {{ satellite_module }}:el8
+  # can't use the `dnf` module for modules without a default stream
+  # https://github.com/ansible/ansible/issues/56504
+  # https://github.com/ansible/ansible/issues/64852
+  args:
+    creates: /etc/dnf/modules.d/{{ satellite_module }}.module
+  when:
     - ansible_distribution_major_version == '8'
-  block:
-    - name: Enable ruby:2.7 module
-      dnf:
-        name: '@ruby:2.7'
-        state: present
-
-    - name: Enable postgresql:12 module
-      dnf:
-        name: '@postgresql:12'
-        state: present
-
-    - name: Get pki-core module info
-      command: dnf module list --enabled
-      register: enabled_modules
-      changed_when: false
-
-    # The dnf module can't enable a module that has no default profile
-    # See https://github.com/ansible/ansible/issues/56504 for details
-    - name: Enable pki-core module
-      command: dnf module enable pki-core -y
-      when: "'pki-core' not in enabled_modules.stdout"
 
 - name: Install Satellite packages
   yum: