From 956836dc6797c9ca95117dc2f28f63d301a811c5 Mon Sep 17 00:00:00 2001 From: Tuan-Dat Tran Date: Wed, 3 Jun 2026 02:17:08 +0200 Subject: [PATCH] fix(common): replace deprecated ansible_ fact references with ansible_facts[] --- roles/common/tasks/bash.yaml | 22 +++++++++++----------- roles/common/tasks/extra_packages.yaml | 12 ++++++------ roles/common/tasks/packages.yaml | 8 ++++---- roles/common/tasks/sshd.yaml | 4 ++-- roles/common/tasks/time.yaml | 8 ++++---- vars/group_vars/all/vars.yaml | 2 +- 6 files changed, 28 insertions(+), 28 deletions(-) diff --git a/roles/common/tasks/bash.yaml b/roles/common/tasks/bash.yaml index dca1cec..3384e3c 100644 --- a/roles/common/tasks/bash.yaml +++ b/roles/common/tasks/bash.yaml @@ -2,9 +2,9 @@ - name: Copy bash-configs ansible.builtin.template: src: "files/bash/{{ item }}" - dest: "{{ ansible_env.HOME }}/.{{ item }}" - owner: "{{ ansible_user_id }}" - group: "{{ ansible_user_id }}" + dest: "{{ ansible_facts['env']['HOME'] }}/.{{ item }}" + owner: "{{ ansible_facts['user_id'] }}" + group: "{{ ansible_facts['user_id'] }}" mode: "644" loop: - bashrc @@ -13,25 +13,25 @@ - name: Copy ghostty infocmp ansible.builtin.copy: src: files/ghostty/infocmp - dest: "{{ ansible_env.HOME }}/ghostty" - owner: "{{ ansible_user_id }}" - group: "{{ ansible_user_id }}" + dest: "{{ ansible_facts['env']['HOME'] }}/ghostty" + owner: "{{ ansible_facts['user_id'] }}" + group: "{{ ansible_facts['user_id'] }}" mode: "0644" register: ghostty_terminfo - name: Compile ghostty terminalinfo - ansible.builtin.command: "tic -x {{ ansible_env.HOME }}/ghostty" + ansible.builtin.command: "tic -x {{ ansible_facts['env']['HOME'] }}/ghostty" when: ghostty_terminfo.changed - name: Copy kitty infocmp ansible.builtin.copy: src: files/kitty/infocmp - dest: "{{ ansible_env.HOME }}/kitty" - owner: "{{ ansible_user_id }}" - group: "{{ ansible_user_id }}" + dest: "{{ ansible_facts['env']['HOME'] }}/kitty" + owner: "{{ ansible_facts['user_id'] }}" + group: "{{ ansible_facts['user_id'] }}" mode: "0644" register: kitty_terminfo - name: Compile kitty terminalinfo - ansible.builtin.command: "tic -x {{ ansible_env.HOME }}/kitty" + ansible.builtin.command: "tic -x {{ ansible_facts['env']['HOME'] }}/kitty" when: kitty_terminfo.changed diff --git a/roles/common/tasks/extra_packages.yaml b/roles/common/tasks/extra_packages.yaml index 690c271..79956ac 100644 --- a/roles/common/tasks/extra_packages.yaml +++ b/roles/common/tasks/extra_packages.yaml @@ -37,21 +37,21 @@ register: neovim_installed changed_when: false ignore_errors: true - when: ansible_architecture != 'aarch64' + when: ansible_facts['architecture'] != 'aarch64' - name: Download Neovim AppImage ansible.builtin.get_url: url: https://github.com/neovim/neovim/releases/download/v0.10.0/nvim.appimage dest: /tmp/nvim.appimage mode: "0755" - when: ansible_architecture != 'aarch64' and neovim_installed.rc != 0 + when: ansible_facts['architecture'] != 'aarch64' and neovim_installed.rc != 0 register: download_result - name: Extract Neovim AppImage ansible.builtin.command: cmd: "./nvim.appimage --appimage-extract" chdir: /tmp - when: ansible_architecture != 'aarch64' and download_result.changed + when: ansible_facts['architecture'] != 'aarch64' and download_result.changed register: extract_result - name: Copy extracted Neovim files to /usr @@ -61,19 +61,19 @@ remote_src: true mode: "0755" become: true - when: ansible_architecture != 'aarch64' and extract_result.changed + when: ansible_facts['architecture'] != 'aarch64' and extract_result.changed - name: Clean up extracted Neovim files ansible.builtin.file: path: /tmp/squashfs-root state: absent - when: ansible_architecture != 'aarch64' and extract_result.changed + when: ansible_facts['architecture'] != 'aarch64' and extract_result.changed - name: Remove Neovim AppImage ansible.builtin.file: path: /tmp/nvim.appimage state: absent - when: ansible_architecture != 'aarch64' and download_result.changed + when: ansible_facts['architecture'] != 'aarch64' and download_result.changed - name: Check if Neovim config directory already exists ansible.builtin.stat: diff --git a/roles/common/tasks/packages.yaml b/roles/common/tasks/packages.yaml index 1eb4969..2dced45 100644 --- a/roles/common/tasks/packages.yaml +++ b/roles/common/tasks/packages.yaml @@ -5,24 +5,24 @@ upgrade: true autoremove: true become: true - when: ansible_user_id != "root" + when: ansible_facts['user_id'] != "root" - name: Install base packages ansible.builtin.apt: name: "{{ common_packages }}" state: present become: true - when: ansible_user_id != "root" + when: ansible_facts['user_id'] != "root" - name: Update and upgrade packages ansible.builtin.apt: update_cache: true upgrade: true autoremove: true - when: ansible_user_id == "root" + when: ansible_facts['user_id'] == "root" - name: Install base packages ansible.builtin.apt: name: "{{ common_packages }}" state: present - when: ansible_user_id == "root" + when: ansible_facts['user_id'] == "root" diff --git a/roles/common/tasks/sshd.yaml b/roles/common/tasks/sshd.yaml index e27769e..0870e2e 100644 --- a/roles/common/tasks/sshd.yaml +++ b/roles/common/tasks/sshd.yaml @@ -8,7 +8,7 @@ notify: - Restart sshd become: true - when: ansible_user_id != "root" + when: ansible_facts['user_id'] != "root" - name: Copy root sshd_config ansible.builtin.template: @@ -18,7 +18,7 @@ backup: true notify: - Restart sshd - when: ansible_user_id == "root" + when: ansible_facts['user_id'] == "root" - name: Copy pubkey ansible.builtin.copy: diff --git a/roles/common/tasks/time.yaml b/roles/common/tasks/time.yaml index 41346a0..edd431c 100644 --- a/roles/common/tasks/time.yaml +++ b/roles/common/tasks/time.yaml @@ -3,12 +3,12 @@ community.general.timezone: name: "{{ timezone }}" become: true - when: ansible_user_id != "root" + when: ansible_facts['user_id'] != "root" - name: Set timezone community.general.timezone: name: "{{ timezone }}" - when: ansible_user_id == "root" + when: ansible_facts['user_id'] == "root" - name: Configure NTP servers for systemd-timesyncd ansible.builtin.lineinfile: @@ -24,11 +24,11 @@ enabled: true state: started become: true - when: ansible_user_id != "root" + when: ansible_facts['user_id'] != "root" - name: Enable and start systemd-timesyncd ansible.builtin.systemd: name: systemd-timesyncd enabled: true state: started - when: ansible_user_id == "root" + when: ansible_facts['user_id'] == "root" diff --git a/vars/group_vars/all/vars.yaml b/vars/group_vars/all/vars.yaml index f994a85..0ec7119 100644 --- a/vars/group_vars/all/vars.yaml +++ b/vars/group_vars/all/vars.yaml @@ -19,7 +19,7 @@ nfs_server: 192.168.20.12 # Packages # -arch: "{{ 'arm64' if ansible_architecture == 'aarch64' else 'amd64' }}" +arch: "{{ 'arm64' if ansible_facts['architecture'] == 'aarch64' else 'amd64' }}" netcup_api_key: "{{ vault_netcup.api_key }}" netcup_api_password: "{{ vault_netcup.api_password }}"