diff options
Diffstat (limited to 'ansible/roles')
| -rw-r--r-- | ansible/roles/docker/tasks/install_docker.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/k8s/tasks/install_k3s_worker.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/update_system/tasks/main.yml | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ansible/roles/docker/tasks/install_docker.yml b/ansible/roles/docker/tasks/install_docker.yml index 3179618..38c56c1 100644 --- a/ansible/roles/docker/tasks/install_docker.yml +++ b/ansible/roles/docker/tasks/install_docker.yml @@ -1,8 +1,8 @@ --- - name: Set Docker repository variables based on OS ansible.builtin.set_fact: - docker_repo: "{{ docker_repos[ansible_distribution] }}" - docker_gpg_key_url: "{{ docker_gpg_keys[ansible_distribution] }}" + docker_repo: "{{ docker_repos[ansible_facts['distribution']] }}" + docker_gpg_key_url: "{{ docker_gpg_keys[ansible_facts['distribution']] }}" - name: Install required dependencies ansible.builtin.apt: @@ -27,7 +27,7 @@ ansible.builtin.apt_repository: repo: >- deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.asc] - {{ docker_repo }} {{ ansible_distribution_release }} stable + {{ docker_repo }} {{ ansible_facts['distribution_release'] }} stable state: present filename: docker diff --git a/ansible/roles/k8s/tasks/install_k3s_worker.yml b/ansible/roles/k8s/tasks/install_k3s_worker.yml index b550b88..eda028b 100644 --- a/ansible/roles/k8s/tasks/install_k3s_worker.yml +++ b/ansible/roles/k8s/tasks/install_k3s_worker.yml @@ -2,7 +2,7 @@ - name: Retrieve k3s token and master IP from master node ansible.builtin.set_fact: k3s_token: "{{ hostvars[groups['tag_k3s_master'][0]].k3s_token }}" - k3s_master_ip: "{{ hostvars[groups['tag_k3s_master'][0]].ansible_default_ipv4.address }}" + k3s_master_ip: "{{ hostvars[groups['tag_k3s_master'][0]].ansible_facts['default_ipv4']['address'] }}" when: hostvars[groups['tag_k3s_master'][0]].k3s_token is defined - name: Ensure /opt/k3s directory exists diff --git a/ansible/roles/update_system/tasks/main.yml b/ansible/roles/update_system/tasks/main.yml index 6195d64..b83dca4 100644 --- a/ansible/roles/update_system/tasks/main.yml +++ b/ansible/roles/update_system/tasks/main.yml @@ -4,7 +4,7 @@ update_cache: true upgrade: true autoremove: true - when: ansible_pkg_mgr == "apt" + when: ansible_facts['pkg_mgr'] == "apt" - name: Update and upgrade system packages (RedHat-based) ansible.builtin.dnf: @@ -12,5 +12,5 @@ name: "*" state: present autoremove: true - when: ansible_pkg_mgr == "dnf" + when: ansible_facts['pkg_mgr'] == "dnf" ... |