Merge pull request #187 from ilifu/bugfix

Use ansible_facts[] instead of injected top-level facts

Author: kennedydane

.claude/skills/add-software/SKILL.md

@@ -83,7 +83,7 @@ An install runs **only when both tags are supplied**:
       community.general.make:
         chdir: "{{ unzip_dir }}"
       environment:
-        MAKEFLAGS: "-j {{ ansible_processor_vcpus }}"
+        MAKEFLAGS: "-j {{ ansible_facts['processor_vcpus'] }}"
     - name: Install <software> {{ version_number }}
       community.general.make:
         chdir: "{{ unzip_dir }}"

.github/workflows/lint.yml

@@ -31,3 +31,17 @@ jobs:
       - name: ansible-lint
         working-directory: ansible
         run: uv run ansible-lint
+
+      # ansible-lint ships no rule for this, so it needs its own gate. Facts must
+      # be read as ansible_facts['name']; the bare injected form is deprecated in
+      # ansible-core 2.21 and removed in 2.24. Covers the non-YAML templates
+      # (.def/.sh/.lua/.j2) that neither linter looks at.
+      - name: Reject bare injected facts
+        working-directory: ansible
+        run: |
+          if grep -rnE '\bansible_(env|processor_vcpus|processor_count|architecture)\b' \
+               --include='*.yml' --include='*.yaml' --include='*.def' \
+               --include='*.j2' --include='*.lua' --include='*.sh' .; then
+            echo "::error::Use ansible_facts['name'] - top-level fact injection is removed in ansible-core 2.24"
+            exit 1
+          fi

CLAUDE.md

@@ -89,3 +89,8 @@ uv run ansible-lint        # target profile: production
   `vars:` must be a **mapping, not a list**.
 - Unpack into **`/dev/shm`**; use **`creates:`** on build commands for idempotency.
 - Keep any Jinja template at the **end** of a task `name:`.
+- **Facts via `ansible_facts['name']`**, never the bare injected `ansible_processor_vcpus`
+  / `ansible_env` form — top-level injection is deprecated in ansible-core 2.21 and removed
+  in 2.24. `ansible.cfg` sets `inject_facts_as_vars = False`, so a bare reference fails at
+  runtime; a CI grep step gates it at PR time (ansible-lint has no rule for this). Magic and
+  connection vars (`ansible_run_tags`, `ansible_connection`) are unaffected.

ansible/ansible.cfg

@@ -3,6 +3,10 @@ ansible_connection = ssh
 inventory = ./inventory
 roles_path = ./roles
 gathering = smart
+# Facts are consumed via ansible_facts['name']; top-level injection is removed
+# in ansible-core 2.24. Disabling it now makes any missed bare `ansible_*`
+# reference fail loudly instead of silently resolving to the wrong thing.
+inject_facts_as_vars = False
 # fact_caching = redis
 
 

ansible/group_vars/all

@@ -28,7 +28,7 @@ python_dir: "{{ common_dir }}/python"
 uv_version: "0.11.23"
 uv_dir: "{{ common_dir }}/uv"
 uv: "{{ uv_dir }}/{{ uv_version }}/bin/uv"
-uv_arch: "{{ ansible_architecture }}"   # x86_64 / aarch64
+uv_arch: "{{ ansible_facts['architecture'] }}"   # x86_64 / aarch64
 uv_checksums:
   x86_64: "sha256:e12c4cda2fe8c305510a78380a88f2c32a27e90cdcd123cefd2873388f0ebb5f"
   aarch64: "sha256:1873a77350f6621279ae1a0d2227f2bd8b67131598f14a7eb0ba2215d3da2c98"

ansible/roles/compiled/tasks/astro/calceph.yaml

@@ -1,7 +1,7 @@
 ---
 - name: Install calceph
   environment:
-    MAKEFLAGS: "-j {{  ansible_processor_vcpus }}"
+    MAKEFLAGS: "-j {{  ansible_facts['processor_vcpus'] }}"
     FFLAGS: "-fallow-argument-mismatch"
     CC: "gcc-10"
     FC: "gfortran-10"

ansible/roles/compiled/tasks/astro/cfitsio.yaml

@@ -33,15 +33,15 @@
       community.general.make:
         chdir: "{{ unzipdir }}"
       environment:
-        MAKEFLAGS: "-j {{  ansible_processor_vcpus }}"
+        MAKEFLAGS: "-j {{  ansible_facts['processor_vcpus'] }}"
 
     - name: Build cfitsio shared {{ version_number }}
       when: "'3.' in version_number"
       community.general.make:
         chdir: "{{ unzipdir }}"
         target: shared
       environment:
-        MAKEFLAGS: "-j {{  ansible_processor_vcpus }}"
+        MAKEFLAGS: "-j {{  ansible_facts['processor_vcpus'] }}"
 
     - name: Install cfitsio {{ version_number }}
       community.general.make:

ansible/roles/compiled/tasks/bio/ambertools.yaml

@@ -22,14 +22,14 @@
     - never
     - ambertools{{ item.version_number }}
   environment:
-    PATH: "{{ cuda_root }}/bin:{{ mpi_root }}/bin:{{ hwloc_root }}/bin:{{ python_root }}/bin:{{ ansible_env.PATH }}"
-    INCLUDE: "{{ cuda_root }}/include:{{ mpi_root }}/include:{{ hwloc_root }}/include:{{ python_root }}/include{% if 'INCLUDE' in ansible_env %}:{{ ansible_env.INCLUDE
+    PATH: "{{ cuda_root }}/bin:{{ mpi_root }}/bin:{{ hwloc_root }}/bin:{{ python_root }}/bin:{{ ansible_facts['env'].PATH }}"
+    INCLUDE: "{{ cuda_root }}/include:{{ mpi_root }}/include:{{ hwloc_root }}/include:{{ python_root }}/include{% if 'INCLUDE' in ansible_facts['env'] %}:{{ ansible_facts['env'].INCLUDE
       }}{% endif %}"
-    LD_LIBRARY_PATH: "{{ cuda_root }}/lib64:{{ mpi_root }}/lib:{{ hwloc_root }}/lib:{{ python_root }}/lib{% if 'LD_LIBRARY_PATH' in ansible_env %}:{{ ansible_env.LD_LIBRARY_PATH
+    LD_LIBRARY_PATH: "{{ cuda_root }}/lib64:{{ mpi_root }}/lib:{{ hwloc_root }}/lib:{{ python_root }}/lib{% if 'LD_LIBRARY_PATH' in ansible_facts['env'] %}:{{ ansible_facts['env'].LD_LIBRARY_PATH
       }}{% endif %}"
     PKG_CONFIG_PATH: "{{ cuda_root }}/pkgconfig:{{ mpi_root }}/lib/pkgconfig:{{ hwloc_root }}/lib/pkgconfig:{{ python_root }}/lib/pkgconfig{% if 'PKG_CONFIG_PATH'
-      in ansible_env %}:{{ ansible_env.PKG_CONFIG_PATH }}{% endif %}"
-    MAKEFLAGS: "-j {{ ansible_processor_vcpus }}"
+      in ansible_facts['env'] %}:{{ ansible_facts['env'].PKG_CONFIG_PATH }}{% endif %}"
+    MAKEFLAGS: "-j {{ ansible_facts['processor_vcpus'] }}"
     CUDA_PATH: "{{ cuda_root }}"
     CUDA_DIR: "{{ cuda_root }}"
   block:

ansible/roles/compiled/tasks/bio/bamtools.yaml

@@ -48,11 +48,11 @@
           community.general.make:
             chdir: "{{ unzip_dir }}/build"
             target: all
-            jobs: "{{ ansible_processor_count }}"
+            jobs: "{{ ansible_facts['processor_count'] }}"
             params:
               DESTDIR: "{{ unzip_dir }}/staging"
           environment:
-            MAKEFLAGS: "-j {{ ansible_processor_count }}"
+            MAKEFLAGS: "-j {{ ansible_facts['processor_count'] }}"
 
         - name: Run make install
           community.general.make:

ansible/roles/compiled/tasks/bio/bcftools.yaml

@@ -39,7 +39,7 @@
           community.general.make:
             chdir: "{{ unzip_dir }}"
           environment:
-            MAKEFLAGS: "-j {{ ansible_processor_vcpus }}"
+            MAKEFLAGS: "-j {{ ansible_facts['processor_vcpus'] }}"
         - name: Install bcftools {{ version_number }} to {{ install_dir }}
           community.general.make:
             chdir: "{{ unzip_dir }}"