Fix redis offline install (itential#252)

* Remove offline-install.yml
* Print details when installing Redis offline

Author: kvelarde-itential

docs/redis_guide.md

@@ -80,7 +80,6 @@ The following tables lists the default variables located in `roles/redis/default
 | Variable | Type | Description | Default Value |
 | :------- | :--- | :---------- | :------------ |
 | `redis_install_from_source` | String | The method used to install Redis. Set to `true` to install from source (default). Set to `false` to install using DNF packages. | `true` |
-| `redis_dependency_packages` | List | The dependency packages required to run Redis | See role. |
 | `redis_build_packages` | List | The packages required to build Redis from source | See role. |
 | `redis_security_packages` | List | The packages required to configure SELinux | See role. |
 | `redis_packages` | List | The Redis packages to install | Varies depending on OS and Platform release |

roles/redis/defaults/main/install.yml

@@ -1,10 +1,7 @@
 # Copyright (c) 2024, Itential, Inc
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
-redis_dependency_packages:
-  - tar
-  - unzip
-
+# Packages required to configure SELinux
 redis_security_packages:
   - policycoreutils-python-utils
 
@@ -15,6 +12,8 @@ redis_install_from_source: true
 
 # Packages required to build Redis from source
 redis_build_packages:
+  - tar
+  - unzip
   - gcc
   - gcc-c++
   - make

roles/redis/tasks/configure-selinux.yml

@@ -10,10 +10,19 @@
         state: present
         update_cache: true
       when:
+        - not offline_install_enabled | bool
         - redis_security_packages is defined
         - redis_security_packages is iterable
         - redis_security_packages | length > 0
 
+    - name: Install Redis security packages (offline)
+      ansible.builtin.import_role:
+        name: offline
+        tasks_from: install-rpms
+      when: offline_install_enabled | bool
+      vars:
+        offline_rpms_path: "{{ redis_offline_control_node_rpms_dir }}/security"
+
     - name: SELinux - Install custom profiles
       ansible.builtin.include_role:
         name: selinux

roles/redis/tasks/download-packages.yml

@@ -10,6 +10,23 @@
   ansible.builtin.include_tasks:
     file: validate-vars-offline.yml
 
+- name: Download Redis security RPMs
+  ansible.builtin.import_role:
+    name: offline
+    tasks_from: download-rpms
+  vars:
+    offline_download_method: yum_module
+    offline_download_packages: "{{ redis_security_packages }} "
+    offline_download_dir: "{{ redis_offline_target_node_rpms_dir }}/security"
+
+- name: Copy Redis dependency RPMs to control node
+  ansible.builtin.import_role:
+    name: offline
+    tasks_from: fetch-packages
+  vars:
+    offline_src_dir: "{{ redis_offline_target_node_rpms_dir }}/security"
+    offline_dest_dir: "{{ redis_offline_control_node_rpms_dir }}/security"
+
 - name: Download package from Remi repo
   when: not redis_install_from_source | bool
   block:
@@ -20,23 +37,6 @@
         - redis_packages is defined
         - redis_packages is search('remi')
 
-    - name: Download Redis dependency RPMs
-      ansible.builtin.import_role:
-        name: offline
-        tasks_from: download-rpms
-      vars:
-        offline_download_method: yum_module
-        offline_download_packages: "{{ redis_dependency_packages }} "
-        offline_download_dir: "{{ redis_offline_target_node_rpms_dir }}/dependencies"
-
-    - name: Copy Redis dependency RPMs to control node
-      ansible.builtin.import_role:
-        name: offline
-        tasks_from: fetch-packages
-      vars:
-        offline_src_dir: "{{ redis_offline_target_node_rpms_dir }}/dependencies"
-        offline_dest_dir: "{{ redis_offline_control_node_rpms_dir }}/dependencies"
-
     - name: Download Redis RPMs
       ansible.builtin.import_role:
         name: offline

roles/redis/tasks/install-common.yml

@@ -11,12 +11,6 @@
     name: vm.overcommit_memory
     value: 1
 
-- name: Install Redis dependency packages
-  ansible.builtin.dnf:
-    name: "{{ redis_dependency_packages }}"
-    state: present
-    update_cache: true
-
 # Check if firewalld is running, if it is then open the appropriate ports
 - name: Gather service facts
   ansible.builtin.service_facts:

roles/redis/tasks/install-from-repo.yml

@@ -1,16 +1,27 @@
 # Copyright (c) 2024, Itential, Inc
 # GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
 ---
-- name: Include tasks to install Remi repo
-  ansible.builtin.include_tasks:
-    file: install-remi-repo.yml
-  when:
-    - redis_packages is defined
-    - redis_packages is search('remi')
+- name: Install Redis from packages
+  when: not offline_install_enabled | bool
+  block:
+    - name: Include tasks to install Remi repo
+      ansible.builtin.include_tasks:
+        file: install-remi-repo.yml
+      when:
+        - redis_packages is defined
+        - redis_packages is search('remi')
 
-- name: Install Redis from YUM repo
-  ansible.builtin.package:
-    name: '{{ redis_packages }}'
-    state: present
-    update_cache: true
-    enablerepo: "{{ redis_packages is search('remi') | ternary('remi', omit) }}"
+    - name: Install Redis from packages
+      ansible.builtin.dnf:
+        name: '{{ redis_packages }}'
+        state: present
+        update_cache: true
+        enablerepo: "{{ redis_packages is search('remi') | ternary('remi', omit) }}"
+
+- name: Install Redis from packages (offline)
+  ansible.builtin.import_role:
+    name: offline
+    tasks_from: install-rpms
+  when: offline_install_enabled | bool
+  vars:
+    offline_rpms_path: "{{ redis_offline_control_node_rpms_dir }}/redis"

roles/redis/tasks/install-from-source.yml

@@ -33,7 +33,7 @@
       register: redis_build_temp_dir
 
     - name: Online install
-      when: not offline_install_enabled
+      when: not offline_install_enabled | bool
       block:
         - name: Install Redis build packages
           ansible.builtin.dnf:
@@ -65,8 +65,15 @@
             redis_build_dir: "{{ unarchive_result.src.split('.tar.gz')[0] }}"
 
     - name: Offline install
-      when: offline_install_enabled
+      when: offline_install_enabled | bool
       block:
+        - name: Install Redis build packages (offline)
+          ansible.builtin.import_role:
+            name: offline
+            tasks_from: install-rpms
+          vars:
+            offline_rpms_path: "{{ redis_offline_control_node_rpms_dir }}/build"
+
         - name: Copy Redis archive (offline)
           ansible.builtin.copy:
             src: "{{ item }}"
@@ -87,7 +94,7 @@
             remote_src: true
           register: unarchive_result
 
-        - name: Set the Redis build directory
+        - name: Set the Redis build directory (offline)
           ansible.builtin.set_fact:
             redis_build_dir: "{{ unarchive_result.src.split('.tar.gz')[0] }}"
 
@@ -105,7 +112,7 @@
         path: "{{ redis_build_temp_dir.path }}"
         state: absent
 
-    - name: Uninstall Redis build packages
+    - name: Uninstall Redis build packages (offline)
       ansible.builtin.dnf:
         name: "{{ item }}"
         allowerasing: true
@@ -114,7 +121,7 @@
       with_items: "{{ redis_install_result.results | selectattr('changed', 'equalto', true)
                   | map(attribute='item') }}"
       when:
-        - not offline_install_enabled
+        - not offline_install_enabled | bool
         - redis_install_result.results is defined
         - redis_install_result.results is iterable
         - redis_install_result.results | length > 0

roles/redis/tasks/install-offline.yml

@@ -19,23 +19,15 @@
           ansible.builtin.include_tasks:
             file: install-common.yml
 
-        - name: Include tasks to perform online installation
-          when: not offline_install_enabled
-          block:
-            - name: Include tasks to install Redis using source
-              ansible.builtin.include_tasks:
-                file: install-from-source.yml
-              when: redis_install_from_source | bool
-
-            - name: Include tasks to install Redis using repo
-              ansible.builtin.include_tasks:
-                file: install-from-repo.yml
-              when: not redis_install_from_source | bool
+        - name: Include tasks to install Redis from source
+          ansible.builtin.include_tasks:
+            file: install-from-source.yml
+          when: redis_install_from_source | bool
 
-        - name: Include tasks to perform offline installation
+        - name: Include tasks to install Redis using repo
           ansible.builtin.include_tasks:
-            file: install-offline.yml
-          when: offline_install_enabled
+            file: install-from-repo.yml
+          when: not redis_install_from_source | bool
 
     - name: Configure SELinux
       tags: configure_selinux

roles/redis/tasks/main.yml

@@ -101,7 +101,7 @@
             - not redis_install_from_source | bool
 
     - name: Print Redis installation details
-      when: not offline_install_enabled
+      when: not offline_install_enabled | bool
       block:
         - name: Print Redis installation details when installing from source
           ansible.builtin.debug:
@@ -112,3 +112,8 @@
           ansible.builtin.debug:
             msg: "Redis packages: {{ redis_packages }}"
           when: not redis_install_from_source | bool
+
+    - name: Print Redis installation details (offline)
+      ansible.builtin.debug:
+        msg: "Redis offline install using files from {{ redis_offline_control_node_root }}"
+      when: offline_install_enabled | bool