zuul/zuul-jobs
Code Issues Proposed changes

Rename vars/ directory to prevent conflicts

Browse Source 
/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
This commit is contained in:
Sagi Shnaidman 2020-01-12 23:34:20 +02:00
parent 33fc86060b
commit 4d168ed016
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
playbooks/tox/vars/redhat-7.yaml → playbooks/tox/molecule-vars/redhat-7.yaml
View File

0
playbooks/tox/vars/redhat-8.yaml → playbooks/tox/molecule-vars/redhat-8.yaml
View File

12
playbooks/tox/pre-molecule.yaml
View File

@ -7,12 +7,12 @@
with_first_found: with_first_found:
- skip: true - skip: true
files: files:
- "vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yaml" - "molecule-vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yaml"
- "vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" - "molecule-vars/{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yaml"
- "vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yaml" - "molecule-vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yaml"
- "vars/{{ ansible_distribution | lower }}.yaml" - "molecule-vars/{{ ansible_distribution | lower }}.yaml"
- "vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yaml" - "molecule-vars/{{ ansible_os_family | lower }}-{{ ansible_distribution_version.split('.')[0] }}.yaml"
- "vars/{{ ansible_os_family | lower }}.yaml" - "molecule-vars/{{ ansible_os_family | lower }}.yaml"
tags: tags:
- always - always