Improve nomad_curl_package variable.

This sets an overridable default of 'curl', but for backwards compatibility makes it curl-minimal for AlmaLinux 9.
ansible-community · Aug 12, 2024 · 8ca1ff2 · 8ca1ff2
1 parent 78a3846
commit 8ca1ff2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -33,6 +33,9 @@ os_supported_matrix:
 ## Core
 nomad_debug: false
 
+## Package configuration
+nomad_curl_package: "{% if (ansible_distribution == 'AlmaLinux' and ansible_distribution_version is version('9', '>=')) %}curl-minimal{% else %}curl{% endif %}"
+
 ## Asserts
 nomad_skip_ensure_all_hosts: "{{ lookup('env', 'NOMAD_SKIP_ENSURE_ALL_HOSTS') | default('false', true) }}"
 

diff --git a/molecule/_shared/base.yml b/molecule/_shared/base.yml
@@ -32,6 +32,6 @@ provisioner:
         nomad_node_role: both
     host_vars:
       rockylinux-9:
-        minimal_curl: true
+        nomad_curl_package: "curl-minimal"
 verifier:
   name: ansible
diff --git a/vars/RedHat.yml b/vars/RedHat.yml
@@ -2,7 +2,7 @@
 # File: vars/RedHat.yml - Red Hat OS variables for Nomad
 
 nomad_os_packages:
-  - "{% if (ansible_distribution == 'AlmaLinux' and ansible_distribution_version is version('9', '>=')) or (minimal_curl is defined) %}curl-minimal{% else %}curl{% endif %}"
+  - "{{ nomad_curl_package }}"
   - git
   - "{% if (ansible_distribution == 'Fedora' and ansible_distribution_version is version('28', '<')) or (ansible_distribution == 'CentOS' and ansible_distribution_version
     is version('8', '<')) or (ansible_distribution == 'Amazon' and ansible_distribution_version is version('3', '<')) or (ansible_distribution == 'OracleLinux' and