From a996408ce6b8946a85eb36fc490ba4e1009378b8 Mon Sep 17 00:00:00 2001 From: Buba Date: Sun, 3 May 2026 23:09:46 +0200 Subject: [PATCH] Fix "ansible_" variable deprecations - use "ansible_facts" --- ansible/roles/debian_base/tasks/50-crowdsec.yaml | 2 +- ansible/roles/debian_docker_host/tasks/10-docker-Debian.yaml | 2 +- ansible/roles/debian_docker_host/tasks/10-docker-Ubuntu.yaml | 2 +- ansible/roles/debian_docker_host/tasks/main.yaml | 2 +- ansible/roles/debian_tools/tasks/20-homebrew.yaml | 2 +- ansible/roles/mac_base/tasks/10-homebrew.yaml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible/roles/debian_base/tasks/50-crowdsec.yaml b/ansible/roles/debian_base/tasks/50-crowdsec.yaml index 7ebde7a7..a3f29e40 100644 --- a/ansible/roles/debian_base/tasks/50-crowdsec.yaml +++ b/ansible/roles/debian_base/tasks/50-crowdsec.yaml @@ -13,7 +13,7 @@ - name: Add crowdsec apt repository ansible.builtin.apt_repository: - repo: deb https://packagecloud.io/crowdsec/crowdsec/{{ ansible_distribution | lower }}/ {{ ansible_distribution_release }} main + repo: deb https://packagecloud.io/crowdsec/crowdsec/{{ ansible_facts["distribution"] | lower }}/ {{ ansible_facts["distribution_release"] }} main state: present filename: crowdsec update_cache: true diff --git a/ansible/roles/debian_docker_host/tasks/10-docker-Debian.yaml b/ansible/roles/debian_docker_host/tasks/10-docker-Debian.yaml index 3e30b9fd..47959ae3 100644 --- a/ansible/roles/debian_docker_host/tasks/10-docker-Debian.yaml +++ b/ansible/roles/debian_docker_host/tasks/10-docker-Debian.yaml @@ -21,7 +21,7 @@ - name: Add Docker Repository (on Debian) ansible.builtin.apt_repository: - repo: deb https://download.docker.com/linux/debian {{ ansible_distribution_release }} stable + repo: deb https://download.docker.com/linux/debian {{ ansible_facts["distribution_release"] }} stable state: present - name: Update apt and install Docker packages diff --git a/ansible/roles/debian_docker_host/tasks/10-docker-Ubuntu.yaml b/ansible/roles/debian_docker_host/tasks/10-docker-Ubuntu.yaml index 99d6d465..69fbb0cf 100644 --- a/ansible/roles/debian_docker_host/tasks/10-docker-Ubuntu.yaml +++ b/ansible/roles/debian_docker_host/tasks/10-docker-Ubuntu.yaml @@ -20,7 +20,7 @@ - name: Add Docker Repository (on Ubuntu) ansible.builtin.apt_repository: - repo: deb https://download.docker.com/linux/ubuntu {{ ansible_distribution_release }} stable + repo: deb https://download.docker.com/linux/ubuntu {{ ansible_facts["distribution_release"] }} stable state: present - name: Update apt and install Docker packages diff --git a/ansible/roles/debian_docker_host/tasks/main.yaml b/ansible/roles/debian_docker_host/tasks/main.yaml index aebe0cd6..970d1f41 100644 --- a/ansible/roles/debian_docker_host/tasks/main.yaml +++ b/ansible/roles/debian_docker_host/tasks/main.yaml @@ -6,7 +6,7 @@ ansible.builtin.include_tasks: "{{ item }}" with_first_found: - files: - - "10-docker-{{ ansible_distribution }}.yaml" + - "10-docker-{{ ansible_facts['distribution'] }}.yaml" - name: Configure Docker ansible.builtin.import_tasks: 20-docker-config.yaml diff --git a/ansible/roles/debian_tools/tasks/20-homebrew.yaml b/ansible/roles/debian_tools/tasks/20-homebrew.yaml index 02385b18..911e11b3 100644 --- a/ansible/roles/debian_tools/tasks/20-homebrew.yaml +++ b/ansible/roles/debian_tools/tasks/20-homebrew.yaml @@ -43,7 +43,7 @@ name: "{{ debian_tools_brew_cask_packages }}" state: latest when: - - ansible_system == "Darwin" + - ansible_facts["system"] == "Darwin" - debian_tools_brew_cask_packages is defined - debian_tools_brew_cask_packages | type_debug == 'list' - debian_tools_brew_cask_packages | length > 0 diff --git a/ansible/roles/mac_base/tasks/10-homebrew.yaml b/ansible/roles/mac_base/tasks/10-homebrew.yaml index 346caf96..819953e7 100644 --- a/ansible/roles/mac_base/tasks/10-homebrew.yaml +++ b/ansible/roles/mac_base/tasks/10-homebrew.yaml @@ -4,13 +4,13 @@ ansible.builtin.stat: path: /home/linuxbrew/.linuxbrew/bin/brew register: mac_base_homebrew_check - when: ansible_system == "Linux" + when: ansible_facts["system"] == "Linux" - name: Check if Homebrew is installed ansible.builtin.stat: path: /opt/homebrew/bin/brew register: mac_base_homebrew_check - when: ansible_system == "Darwin" + when: ansible_facts["system"] == "Darwin" - name: Install Homebrew ansible.builtin.shell: /bin/bash -c "NONINTERACTIVE=true $(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"