From 43a3c14e4bf2ab0bc7ae49ef098b12deb457e63a Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Wed, 26 Nov 2025 14:10:33 +0100 Subject: [PATCH] Porting ansible to 2.5 See: https://docs.ansible.com/projects/ansible/latest/porting_guides/porting_guide_2.5.html#ansible-fact-namespacing --- tasks/main.yml | 6 +++--- tasks/setup_debian.yml | 6 +++--- tasks/setup_redhat.yml | 6 +++--- tasks/variables.yml | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index d3f94c3..4954a35 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -5,15 +5,15 @@ - name: Include task setup_debian.yml ansible.builtin.include_tasks: setup_debian.yml - when: ansible_os_family == "Debian" + when: ansible_facts.os_family == "Debian" - name: Include task setup_redhat.yml ansible.builtin.include_tasks: setup_redhat.yml - when: ansible_os_family == "RedHat" + when: ansible_facts.os_family == "RedHat" - name: Include task setup_alpine.yml ansible.builtin.include_tasks: setup_alpine.yml - when: ansible_os_family == "Alpine" + when: ansible_facts.os_family == "Alpine" - name: Include task configure.yml ansible.builtin.import_tasks: configure.yml diff --git a/tasks/setup_debian.yml b/tasks/setup_debian.yml index b0de0ec..a5696be 100644 --- a/tasks/setup_debian.yml +++ b/tasks/setup_debian.yml @@ -34,14 +34,14 @@ - name: Determine repo distribution release ansible.builtin.set_fact: repo_distribution_release: >- - {{ 'sid' if 'forky' in ansible_distribution_release else ansible_distribution_release }} + {{ 'sid' if 'forky' in ansible_facts.distribution_release else ansible_facts.distribution_release }} - name: Setup MariaDB repository sourcelist entry ansible.builtin.copy: dest: /etc/apt/sources.list.d/mariadb.list content: | # Ansible managed - deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] {{ mariadb_use_official_repo_url }}/{{ mariadb_use_official_repo_version }}/{{ ansible_distribution | lower() }} {{ repo_distribution_release }} main + deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] {{ mariadb_use_official_repo_url }}/{{ mariadb_use_official_repo_version }}/{{ ansible_facts.distribution | lower() }} {{ repo_distribution_release }} main owner: root group: root mode: "0644" @@ -54,7 +54,7 @@ # Ansible managed X-Repolib-Name: MariaDB Types: deb - URIs: {{ mariadb_use_official_repo_url }}/{{ mariadb_use_official_repo_version }}/{{ ansible_distribution | lower() }} + URIs: {{ mariadb_use_official_repo_url }}/{{ mariadb_use_official_repo_version }}/{{ ansible_facts.distribution | lower() }} Suites: {{ repo_distribution_release }} Components: main Signed-By: /etc/apt/keyrings/mariadb-keyring.pgp diff --git a/tasks/setup_redhat.yml b/tasks/setup_redhat.yml index 2df92c9..99e5f50 100644 --- a/tasks/setup_redhat.yml +++ b/tasks/setup_redhat.yml @@ -7,10 +7,10 @@ # https://mariadb.org/download/ [mariadb] name = MariaDB - {% if ansible_distribution == "Fedora" %} - baseurl = https://rpm.mariadb.org/{{ mariadb_use_official_repo_version }}/fedora{{ ansible_distribution_major_version }}-amd64 + {% if ansible_facts.distribution == "Fedora" %} + baseurl = https://rpm.mariadb.org/{{ mariadb_use_official_repo_version }}/fedora{{ ansible_facts.distribution_major_version }}-amd64 {% else %} - baseurl = https://rpm.mariadb.org/{{ mariadb_use_official_repo_version }}/rhel{{ ansible_distribution_major_version }}-amd64 + baseurl = https://rpm.mariadb.org/{{ mariadb_use_official_repo_version }}/rhel{{ ansible_facts.distribution_major_version }}-amd64 {% endif %} gpgkey = https://yum.mariadb.org/RPM-GPG-KEY-MariaDB module_hotfixes = 1 diff --git a/tasks/variables.yml b/tasks/variables.yml index 003da5d..acdf0e2 100644 --- a/tasks/variables.yml +++ b/tasks/variables.yml @@ -5,8 +5,8 @@ vars: params: files: - - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}.yml" + - "{{ ansible_facts.distribution }}.yml" + - "{{ ansible_facts.os_family }}.yml" paths: - "vars" @@ -24,7 +24,7 @@ ansible.builtin.set_fact: mariadb_server_package_mdbf: "{{ __mariadb_server_package_mdbf }}" when: - - ansible_os_family == "RedHat" + - ansible_facts.os_family == "RedHat" - mariadb_server_package_mdbf is not defined - name: Define mariadb_config_file.