From 72da21896c2d0f445fef802e0a599bfb8e4f9869 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Tue, 23 Sep 2025 09:50:25 +0200 Subject: [PATCH] Adapt testing to #55 #55 was missing molecule testing and verify step needs to be adapted. --- molecule/default/variables.yml | 1 + molecule/default/verify.yml | 11 ++--------- tasks/variables.yml | 7 +++++++ 3 files changed, 10 insertions(+), 9 deletions(-) create mode 120000 molecule/default/variables.yml diff --git a/molecule/default/variables.yml b/molecule/default/variables.yml new file mode 120000 index 0000000..6dadb6c --- /dev/null +++ b/molecule/default/variables.yml @@ -0,0 +1 @@ +../../tasks/variables.yml \ No newline at end of file diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml index 4445c80..9336e01 100644 --- a/molecule/default/verify.yml +++ b/molecule/default/verify.yml @@ -4,15 +4,8 @@ gather_facts: true tasks: - - name: Load OS-specific vars - ansible.builtin.include_vars: "{{ lookup('first_found', params) }}" - vars: - params: - files: - - "{{ ansible_distribution }}.yml" - - "{{ ansible_os_family }}.yml" - paths: - - "vars" + - name: Include OS vars + ansible.builtin.import_tasks: variables.yml - name: Verify pkg status ansible.builtin.package: diff --git a/tasks/variables.yml b/tasks/variables.yml index 2ab6085..003da5d 100644 --- a/tasks/variables.yml +++ b/tasks/variables.yml @@ -20,6 +20,13 @@ mariadb_server_package: "{{ __mariadb_server_package }}" when: mariadb_server_package is not defined +- name: Define mariadb_server_package_mdbf. + ansible.builtin.set_fact: + mariadb_server_package_mdbf: "{{ __mariadb_server_package_mdbf }}" + when: + - ansible_os_family == "RedHat" + - mariadb_server_package_mdbf is not defined + - name: Define mariadb_config_file. ansible.builtin.set_fact: mariadb_config_file: "{{ __mariadb_config_file }}"