feat: consolidated preinstall tasks

Author: lakrass

tasks/install.yml

@@ -1,30 +1,6 @@
 ---
 # File: tasks/install.yml - package installation tasks for vault
 
-- name: Update package cache
-  ansible.builtin.package:
-    update_cache: true
-  tags: update_cache
-
-- name: OS packages
-  become: true
-  ansible.builtin.package:
-    name: "{{ vault_os_packages }}"
-    state: present
-  tags: installation
-  when: (vault_os_packages is defined) and (vault_os_packages | length > 0)
-
-# Temporary place for one-off version diff packages, etc.
-- name: OS packages diff (Debian)
-  become: true
-  ansible.builtin.package:
-    name: "libcap2-bin"
-    state: present
-  tags: installation
-  when:
-    - ansible_distribution == "Debian"
-    - (ansible_distribution_version == 'buster/sid') or (ansible_distribution_version is version(8.5, '>'))
-
 - name: Check Vault package file (local)
   ansible.builtin.stat:
     path: "{{ role_path }}/files/{{ vault_pkg }}"

tasks/install_remote.yml

@@ -2,14 +2,6 @@
 # File: tasks/install_remote.yml
 #       Package installation tasks for vault
 
-- name: OS packages
-  become: true
-  ansible.builtin.package:
-    name: "{{ vault_os_packages }}"
-    state: present
-  tags: installation
-  when: (vault_os_packages is defined) and (vault_os_packages | length > 0)
-
 - name: Ensure remote vault dir exists
   ansible.builtin.file:
     path: /tmp/vault

tasks/main.yml

@@ -2,23 +2,6 @@
 - name: Include asserts
   ansible.builtin.include_tasks: asserts.yml
 
-- name: Add Vault group
-  become: true
-  ansible.builtin.group:
-    name: "{{ vault_group }}"
-    state: present
-  when: vault_manage_group | bool
-
-- name: Add Vault user
-  become: true
-  ansible.builtin.user:
-    name: "{{ vault_user }}"
-    comment: "Vault user"
-    group: "{{ vault_group }}"
-    groups: "{{ vault_groups }}"
-    system: true
-  when: vault_manage_user | bool
-
 - name: Include OS-specific variables
   ansible.builtin.include_vars: "{{ lookup('first_found', params) }}"
   vars:
@@ -29,6 +12,10 @@
       paths:
         - vars
 
+- name: Run preinstall tasks
+  ansible.builtin.include_tasks: preinstall.yml
+  tags: preinstall
+
 - name: Check Vault installation
   ansible.builtin.shell:
     cmd: command -v vault  # noqa command-instead-of-shell  # command is a shell builtin

tasks/preinstall.yml

@@ -0,0 +1,31 @@
+---
+# File: tasks/preinstall.yml - pre-installation tasks for vault
+
+- name: Add Vault group
+  become: true
+  ansible.builtin.group:
+    name: "{{ vault_group }}"
+    state: present
+  when: vault_manage_group | bool
+
+- name: Add Vault user
+  become: true
+  ansible.builtin.user:
+    name: "{{ vault_user }}"
+    comment: "Vault user"
+    group: "{{ vault_group }}"
+    groups: "{{ vault_groups }}"
+    system: true
+  when: vault_manage_user | bool
+
+- name: Update package cache
+  ansible.builtin.package:
+    update_cache: true
+  tags: update_cache
+
+- name: OS packages
+  become: true
+  ansible.builtin.package:
+    name: "{{ vault_os_packages }}"
+    state: present
+  when: (vault_os_packages is defined) and (vault_os_packages | length > 0)

vars/Debian.yml

@@ -6,6 +6,7 @@ vault_os_packages:
   - unzip
   - acl
   - gpg
+  - libcap2-bin
 
 _vault_repository_url: "https://apt.releases.hashicorp.com"
 _vault_repository_key_url: "{{ _vault_repository_url }}/gpg"