diff --git a/playbooks/tox/vars/redhat-7.yaml b/playbooks/tox/molecule-vars/redhat-7.yaml similarity index 100% rename from playbooks/tox/vars/redhat-7.yaml rename to playbooks/tox/molecule-vars/redhat-7.yaml diff --git a/playbooks/tox/vars/redhat-8.yaml b/playbooks/tox/molecule-vars/redhat-8.yaml similarity index 100% rename from playbooks/tox/vars/redhat-8.yaml rename to playbooks/tox/molecule-vars/redhat-8.yaml diff --git a/playbooks/tox/pre-molecule.yaml b/playbooks/tox/pre-molecule.yaml index ecbe124b4..1c3a6be04 100644 --- a/playbooks/tox/pre-molecule.yaml +++ b/playbooks/tox/pre-molecule.yaml @@ -7,12 +7,12 @@ with_first_found: - skip: true files: - - "vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yaml" - - "vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" - - "vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" - - "vars/{{ ansible_distribution | lower }}.yaml" - - "vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yaml" - - "vars/{{ ansible_os_family | lower }}.yaml" + - "molecule-vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yaml" + - "molecule-vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" + - "molecule-vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" + - "molecule-vars/{{ ansible_distribution | lower }}.yaml" + - "molecule-vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yaml" + - "molecule-vars/{{ ansible_os_family | lower }}.yaml" tags: - always