From 4d168ed01641936a1788145605ade5600a51a8ef Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Sun, 12 Jan 2020 23:34:20 +0200 Subject: [PATCH] Rename vars/ directory to prevent conflicts /vars directories from 'tox' playbook and roles are merged, which creates conflicts and wrong variables are loaded into the playbook Prevent merge of /vars directories from roles and 'tox' playbook by renaming variables directory of playbook to molecule-vars. It should fix failing job tripleo-ansible-centos-7-role-addition Change-Id: Iee6768a27db36a3a18c0728040ab9c09857d55b6 --- playbooks/tox/{vars => molecule-vars}/redhat-7.yaml | 0 playbooks/tox/{vars => molecule-vars}/redhat-8.yaml | 0 playbooks/tox/pre-molecule.yaml | 12 ++++++------ 3 files changed, 6 insertions(+), 6 deletions(-) rename playbooks/tox/{vars => molecule-vars}/redhat-7.yaml (100%) rename playbooks/tox/{vars => molecule-vars}/redhat-8.yaml (100%) 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